Fix invarient state emits for DRI2 (do it per batch, since there's no lock).

(cherry picked from commit cab5b7a7b0e17414f98b2363b0961c87f32f9c05)

1 files changed, 6 insertions, 0 deletions

diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c
index b1c8a8de..671e8c87 100644
--- a/src/i830_batchbuffer.c
+++ b/src/i830_batchbuffer.c
@@ -117,6 +117,12 @@ intel_next_batch(ScrnInfoPtr pScrn)
 
     pI830->batch_used = 0;
     pI830->batch_ptr = pI830->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.
+     */
+    if (pI830->directRenderingType == DRI_DRI2)
+	*pI830->last_3d = LAST_3D_OTHER;
 }
 
 void