summaryrefslogtreecommitdiff
path: root/src/i830_driver.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2009-11-10 11:05:20 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2009-11-10 15:19:08 +0000
commit67af5a99253b1295f8dc09b28863eb7dc8b59e1d (patch)
treea434b1f310c45d00affad115ede2ae92708d5a83 /src/i830_driver.c
parent998d6b3d8c549086fbc8a9f0e309694b23398d8d (diff)
Check that batch buffers are atomic.
Since batch buffers are rarely emitted by themselves but as part of a sequence of state and vertices, the whole sequence is emitted atomically. Here we just enforce that batches are marked as being part of an atomic sequence as appropriate. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/i830_driver.c')
-rw-r--r--src/i830_driver.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 867047c0..445ab37b 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1399,9 +1399,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv)
if (intel->XvEnabled)
I830InitVideo(screen);
- /* Setup 3D engine, needed for rotation too */
- IntelEmitInvarientState(scrn);
-
#if defined(DRI2)
switch (intel->directRenderingType) {
case DRI_DRI2:
@@ -1513,9 +1510,8 @@ static Bool I830EnterVT(int scrnIndex, int flags)
if (!xf86SetDesiredModes(scrn))
return FALSE;
- /* Mark 3D state as being clobbered and setup the basics */
+ /* Mark all state as being clobbered. */
intel->last_3d = LAST_3D_OTHER;
- IntelEmitInvarientState(scrn);
return TRUE;
}