diff options
| author | Nicolai Haehnle <prefect_@gmx.net> | 2005-02-17 22:07:32 +0000 |
|---|---|---|
| committer | Nicolai Haehnle <prefect_@gmx.net> | 2005-02-17 22:07:32 +0000 |
| commit | 6f37e76272a3a4b3898426b943304d1c5903d0ee (patch) | |
| tree | c37b8083a87efc5bbdb225001e4cade9e8c67dbf /src/mesa/drivers/dri/r300/r300_emit.h | |
| parent | 74477b24a8faef4ce0870b4a68270e586d107ff7 (diff) | |
| download | external_mesa3d-6f37e76272a3a4b3898426b943304d1c5903d0ee.zip external_mesa3d-6f37e76272a3a4b3898426b943304d1c5903d0ee.tar.gz external_mesa3d-6f37e76272a3a4b3898426b943304d1c5903d0ee.tar.bz2 | |
Fixing *lots* of warning messages, especially concerning unportable
whitespace before preprocessor commands.
Please, can you try to keep the warnings down? Try running make with
make -s sometime to see just how bad an offender the current code is.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_emit.h')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_emit.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_emit.h b/src/mesa/drivers/dri/r300/r300_emit.h index cba482f..4c155eb 100644 --- a/src/mesa/drivers/dri/r300/r300_emit.h +++ b/src/mesa/drivers/dri/r300/r300_emit.h @@ -45,7 +45,7 @@ #define LOCAL_VARS int cmd_reserved=0;\ int cmd_written=0; \ drm_radeon_cmd_header_t *cmd=NULL; - + #define PREFIX_VOID r300ContextPtr rmesa #define PREFIX PREFIX_VOID , @@ -58,7 +58,7 @@ typedef GLuint CARD32; /* This files defines functions for accessing R300 hardware. It needs to be customized to whatever code r300_lib.c is used in */ - + void static inline check_space(int dwords) { } @@ -184,6 +184,7 @@ static __inline__ uint32_t cmdcpdelay(unsigned short count) void static inline end_3d(PREFIX_VOID) { LOCAL_VARS +(void)cmd_reserved; (void)cmd_written; cmd=(drm_radeon_cmd_header_t *) r300AllocCmdBuf(rmesa, \ 0, \ @@ -195,6 +196,7 @@ cmd[0].header.cmd_type=R300_CMD_END3D; void static inline cp_delay(PREFIX unsigned short count) { LOCAL_VARS +(void)cmd_reserved; (void)cmd_written; cmd=(drm_radeon_cmd_header_t *) r300AllocCmdBuf(rmesa, \ 0, \ @@ -211,7 +213,7 @@ check_space(9); start_packet3(RADEON_CP_PACKET3_3D_DRAW_VBUF_2, 0); /* e32(0x840c0024); */ - e32(R300_VAP_VF_CNTL__PRIM_WALK_VERTEX_LIST | (vertex_count<<16) | type); + e32(R300_VAP_VF_CNTL__PRIM_WALK_VERTEX_LIST | (vertex_count<<16) | type); } /* these are followed by the corresponding data */ @@ -232,9 +234,9 @@ start_packet3(RADEON_CP_PACKET3_3D_DRAW_VBUF_2, 0); start_packet3(RADEON_CP_PACKET3_3D_DRAW_INDX_2, _n); \ e32(R300_VAP_VF_CNTL__PRIM_WALK_INDICES | (_vc<<16) | type); \ } - + /* Interestingly enough this ones needs the call to setup_AOS, even thought - some of the data so setup is not needed and some is not as arbitrary + some of the data so setup is not needed and some is not as arbitrary as when used by DRAW_VBUF_2 or DRAW_INDX_2 */ #define start_immediate_packet(vertex_count, type, vertex_size) \ {\ |