diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_ioctl.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_mem.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_reg.h | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_render.c | 4 | 
4 files changed, 7 insertions, 8 deletions
| diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c index 9e741b3ecd..4bdd35bb24 100644 --- a/src/mesa/drivers/dri/r300/r300_ioctl.c +++ b/src/mesa/drivers/dri/r300/r300_ioctl.c @@ -216,7 +216,6 @@ static void r300EmitClearState(GLcontext * ctx)  	e32(R300_INPUT_CNTL_0_COLOR);  	e32(R300_INPUT_CNTL_POS | R300_INPUT_CNTL_COLOR | R300_INPUT_CNTL_TC0); -  	if (!has_tcl) {  		R300_STATECHANGE(r300, vte);  		/* comes from fglrx startup of clear */ diff --git a/src/mesa/drivers/dri/r300/r300_mem.h b/src/mesa/drivers/dri/r300/r300_mem.h index d2932380ec..625a7f6d8d 100644 --- a/src/mesa/drivers/dri/r300/r300_mem.h +++ b/src/mesa/drivers/dri/r300/r300_mem.h @@ -20,7 +20,7 @@ struct r300_memory_manager {  		int mapped;  	} *u_list;  	int u_head, u_size, u_last; -	 +  };  extern void r300_mem_init(r300ContextPtr rmesa); diff --git a/src/mesa/drivers/dri/r300/r300_reg.h b/src/mesa/drivers/dri/r300/r300_reg.h index e309a48c42..8ff362b9d2 100644 --- a/src/mesa/drivers/dri/r300/r300_reg.h +++ b/src/mesa/drivers/dri/r300/r300_reg.h @@ -23,11 +23,11 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.  **************************************************************************/ +/* *INDENT-OFF* */ +  #ifndef _R300_REG_H  #define _R300_REG_H -/* *INDENT-OFF* */ -  #define R300_MC_INIT_MISC_LAT_TIMER	0x180  #	define R300_MC_MISC__MC_CPR_INIT_LAT_SHIFT	0  #	define R300_MC_MISC__MC_VF_INIT_LAT_SHIFT	4 @@ -1606,6 +1606,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.   */  #define R300_CP_CMD_BITBLT_MULTI	0xC0009B00 -/* *INDENT-ON* */ -  #endif /* _R300_REG_H */ + +/* *INDENT-ON* */ diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c index d967c69c42..cc13e9a530 100644 --- a/src/mesa/drivers/dri/r300/r300_render.c +++ b/src/mesa/drivers/dri/r300/r300_render.c @@ -110,7 +110,7 @@ static int r300PrimitiveType(r300ContextPtr rmesa, GLcontext * ctx, int prim)  		return R300_VAP_VF_CNTL__PRIM_POLYGON;  		break;  	default: -		assert (0); +		assert(0);  		return -1;  		break;  	} @@ -160,7 +160,7 @@ static int r300NumVerts(r300ContextPtr rmesa, int num_verts, int prim)  			verts_off = num_verts;  		break;  	default: -		assert (0); +		assert(0);  		return -1;  		break;  	} | 
