diff options
| author | Eric Anholt <eric@anholt.net> | 2010-03-04 09:32:42 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-03-04 10:13:34 -0800 |
| commit | 4ada6d7a856a941b834871ff8a7c5505ff26ae23 (patch) | |
| tree | 186c53d9819d2745cfc6a7e1be376d7998c0dc1f /src | |
| parent | d92d42303e5ca9f4208ed97823ad8f691121370f (diff) | |
Remove 3D state clobber on EnterVT, and always clobber at batch start.
We know that it's clobbered at each batchbuffer, anyway. And even if
this server isn't running DRI2, it can still be clobbered at batch
start in the KMS world.
Diffstat (limited to 'src')
| -rw-r--r-- | src/i830_batchbuffer.c | 7 | ||||
| -rw-r--r-- | src/i830_driver.c | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c index b8995e27..bf0b55b9 100644 --- a/src/i830_batchbuffer.c +++ b/src/i830_batchbuffer.c @@ -59,11 +59,10 @@ static void intel_next_batch(ScrnInfoPtr scrn) intel->batch_used = 0; intel->batch_ptr = intel->batch_bo->virtual; - /* If we are using DRI2, we don't know when another client has executed, - * so we have to reinitialize our 3D state per batch. + /* We don't know when another client has executed, so we have + * to reinitialize our 3D state per batch. */ - if (intel->directRenderingType == DRI_DRI2) - intel->last_3d = LAST_3D_OTHER; + intel->last_3d = LAST_3D_OTHER; } void intel_batch_init(ScrnInfoPtr scrn) diff --git a/src/i830_driver.c b/src/i830_driver.c index 33138d73..86ef0fad 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1401,9 +1401,6 @@ static Bool I830EnterVT(int scrnIndex, int flags) if (!xf86SetDesiredModes(scrn)) return FALSE; - /* Mark all state as being clobbered. */ - intel->last_3d = LAST_3D_OTHER; - return TRUE; } |