diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2006-07-27 22:51:14 +0000 |
|---|---|---|
| committer | Jerome Glisse <glisse@freedesktop.org> | 2006-07-27 22:51:14 +0000 |
| commit | 32d61d06164c6247bed0fbf301afd24ce5d3473e (patch) | |
| tree | 3ca10bfe010c32e44752ba4ecc2268a1bdb22adc /src/mesa/drivers/dri/r300/r300_ioctl.c | |
| parent | a7722cb794be008f930c5f071f66fc14b38af65a (diff) | |
r300_emit.h cleanup.
Remove unused macro
Replace LOCAL_VAR, PREFIX*
Indent code
Remove radeon redundant CP type 3 packet
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_ioctl.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_ioctl.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c index a05a29b7e1..d0d2def864 100644 --- a/src/mesa/drivers/dri/r300/r300_ioctl.c +++ b/src/mesa/drivers/dri/r300/r300_ioctl.c @@ -65,12 +65,12 @@ static void r300ClearBuffer(r300ContextPtr r300, int flags, int buffer) __DRIdrawablePrivate *dPriv = r300->radeon.dri.drawable; GLuint cboffset, cbpitch; drm_r300_cmd_header_t* cmd2; -#ifdef CB_DPATH - r300ContextPtr rmesa=r300; - LOCAL_VARS; -#else + int cmd_reserved = 0; + int cmd_written = 0; + drm_radeon_cmd_header_t *cmd = NULL; r300ContextPtr rmesa=r300; - LOCAL_VARS; + +#ifndef CB_DPATH int i; #endif @@ -249,7 +249,7 @@ static void r300ClearBuffer(r300ContextPtr r300, int flags, int buffer) #else #if 1 cp_wait(r300, R300_WAIT_3D | R300_WAIT_3D_CLEAN); - end_3d(PASS_PREFIX_VOID); + end_3d(rmesa); #endif R300_STATECHANGE(r300, cb); @@ -345,7 +345,9 @@ static void r300EmitClearState(GLcontext * ctx) r300ContextPtr rmesa=r300; __DRIdrawablePrivate *dPriv = r300->radeon.dri.drawable; int i; - LOCAL_VARS; + int cmd_reserved = 0; + int cmd_written = 0; + drm_radeon_cmd_header_t *cmd = NULL; R300_STATECHANGE(r300, vir[0]); |