summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/r200/r200_ioctl.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-01-29 20:33:07 +1000
committerDave Airlie <airlied@redhat.com>2009-01-29 20:33:07 +1000
commitc9bb5cd20e5468168d54fe461c853926072fa813 (patch)
tree06ecb7492cf44b6715941f9356a859f4de1df506 /src/mesa/drivers/dri/r200/r200_ioctl.c
parent59b183ce0fc8fd8ab73b9321e609fdb3c29bb078 (diff)
downloadexternal_mesa3d-c9bb5cd20e5468168d54fe461c853926072fa813.zip
external_mesa3d-c9bb5cd20e5468168d54fe461c853926072fa813.tar.gz
external_mesa3d-c9bb5cd20e5468168d54fe461c853926072fa813.tar.bz2
r200: bring back single dma flush
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_ioctl.c')
-rw-r--r--src/mesa/drivers/dri/r200/r200_ioctl.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.c b/src/mesa/drivers/dri/r200/r200_ioctl.c
index cb2f50d..0b7f664 100644
--- a/src/mesa/drivers/dri/r200/r200_ioctl.c
+++ b/src/mesa/drivers/dri/r200/r200_ioctl.c
@@ -76,12 +76,12 @@ static void r200BackUpAndEmitLostStateLocked( r200ContextPtr rmesa )
rmesa->radeon.lost_context = GL_FALSE;
- nr_released_bufs = rmesa->dma.nr_released_bufs;
+ nr_released_bufs = rmesa->radeon.dma.nr_released_bufs;
saved_store = rmesa->store;
- rmesa->dma.nr_released_bufs = 0;
+ rmesa->radeon.dma.nr_released_bufs = 0;
rmesa->store = rmesa->backup_store;
rcommonFlushCmdBufLocked( &rmesa->radeon, __FUNCTION__ );
- rmesa->dma.nr_released_bufs = nr_released_bufs;
+ rmesa->radeon.dma.nr_released_bufs = nr_released_bufs;
rmesa->store = saved_store;
}
@@ -302,11 +302,8 @@ void r200Flush( GLcontext *ctx )
if (R200_DEBUG & DEBUG_IOCTL)
fprintf(stderr, "%s\n", __FUNCTION__);
- if (rmesa->swtcl.flush)
- rmesa->swtcl.flush( ctx );
-
- if (rmesa->tcl.flush)
- rmesa->tcl.flush( ctx );
+ if (rmesa->radeon.dma.flush)
+ rmesa->radeon.dma.flush( ctx );
r200EmitState( rmesa );