Upload of interleaved arrays currently assumes that position is the

first element in the interleaved group.  Add a test to catch cases
where this isn't true and use per-array uploads instead.  Fixes compiz
glitches on x64.

diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index 8c6b5a6d2c442a88a950f8566aac5681981ce7e0..cde0aa6481b4fa1f8717946f85e3faeb99d70760 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -435,6 +435,7 @@ GLboolean brw_upload_vertices( struct brw_context *brw,
            ptr = input->glarray->Ptr;
         }
         else if (interleave != input->glarray->StrideB ||
+                 (const char *)input->glarray->Ptr - (const char *)ptr < 0 ||
                  (const char *)input->glarray->Ptr - (const char *)ptr > interleave) {
            interleave = 0;
         }