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.
This commit is contained in:
Eric Anholt 2010-03-04 09:32:42 -08:00
parent d92d42303e
commit 4ada6d7a85
2 changed files with 3 additions and 7 deletions

View File

@ -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)

View File

@ -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;
}