diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-02-10 04:54:24 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-02-10 04:54:24 +1000 |
| commit | ccf7814a315f0be05cdc36ca358e2917a3d4ac19 (patch) | |
| tree | a7a480862ab4eec149451551a3669cb46e5e84ca /src/mesa/drivers/dri/radeon/radeon_ioctl.h | |
| parent | 9df844b109a9d2cc1d3b16315c34ef84f147c5b6 (diff) | |
radeon: major cleanups removing old dead codepaths.
This should be working gears on radeon state
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_ioctl.h')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_ioctl.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.h b/src/mesa/drivers/dri/radeon/radeon_ioctl.h index b7f0729494..ac763703bc 100644 --- a/src/mesa/drivers/dri/radeon/radeon_ioctl.h +++ b/src/mesa/drivers/dri/radeon/radeon_ioctl.h @@ -99,6 +99,7 @@ do { \ /* Can accomodate several state changes and primitive changes without * actually firing the buffer. */ + #define RADEON_STATECHANGE( rmesa, ATOM ) \ do { \ RADEON_NEWPRIM( rmesa ); \ @@ -106,13 +107,12 @@ do { \ rmesa->hw.is_dirty = GL_TRUE; \ } while (0) -#define RADEON_DB_STATE( ATOM ) \ +#define RADEON_DB_STATE( ATOM ) \ memcpy( rmesa->hw.ATOM.lastcmd, rmesa->hw.ATOM.cmd, \ rmesa->hw.ATOM.cmd_size * 4) -static INLINE int RADEON_DB_STATECHANGE( - r100ContextPtr rmesa, - struct radeon_state_atom *atom ) +static INLINE int RADEON_DB_STATECHANGE(r100ContextPtr rmesa, + struct radeon_state_atom *atom ) { if (memcmp(atom->cmd, atom->lastcmd, atom->cmd_size*4)) { GLuint *tmp; @@ -128,12 +128,11 @@ static INLINE int RADEON_DB_STATECHANGE( return 0; } - /* Fire the buffered vertices no matter what. */ #define RADEON_FIREVERTICES( rmesa ) \ do { \ - if ( rmesa->store.cmd_used || rmesa->radeon.dma.flush ) { \ + if ( rmesa->radeon.dma.flush ) { \ radeonFlush( rmesa->radeon.glCtx ); \ } \ } while (0) |