Changeset 26565 in vbox

Timestamp:

Feb 16, 2010 10:57:04 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: fixed host crashes when using GL_EXT_compiled_vertex_array and array element calls (#6165)

Location:

trunk/src/VBox/Additions/common/crOpenGL/pack

Files:

• packspu_beginend.py (modified) (1 diff)
• packspu_client.c (modified) (2 diffs)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_beginend.py

@@ -24 +24 @@
     /* XXX comparing mode >= 0 here is not needed since mode is unsigned */
     CRASSERT( mode >= GL_POINTS && mode <= GL_POLYGON );
+
+#if CR_ARB_vertex_buffer_object
+    {
+        GLboolean serverArrays = GL_FALSE;
+        GET_CONTEXT(ctx);
+        if (ctx->clientState->extensions.ARB_vertex_buffer_object)
+            serverArrays = crStateUseServerArrays();
+        if (serverArrays) {
+            CRClientState *clientState = &(ctx->clientState->client);
+            if (clientState->array.locked && !clientState->array.synced)
+            {
+                crPackLockArraysEXT(clientState->array.lockFirst, clientState->array.lockCount);
+                clientState->array.synced = GL_TRUE;
+            }
+        }
+    }
+#endif
 
     if (pack_spu.swap)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_client.c

@@ -192 +192 @@
         CRClientState *clientState = &(ctx->clientState->client);
 
-        /*Note the comment in packspu_LockArraysEXT*/
-        if (clientState->array.locked && !clientState->array.synced)
-        {
-            crPackLockArraysEXT(clientState->array.lockFirst, clientState->array.lockCount);
-            clientState->array.synced = GL_TRUE;
-        }
+        /* LockArraysEXT can not be executed between glBegin/glEnd pair, it also
+         * leads to vertexpointers being adjusted on the host side between glBegin/glEnd calls which
+         * produces unpredictable results. Locking is done before the glBegin call instead.
+         */
+        CRASSERT(!clientState->array.locked || clientState->array.synced);
 
         /* Send the DrawArrays command over the wire */
@@ -492 +491 @@
         /*Note: this is a workaround for quake3 based apps.
           It's modifying vertex data between glLockArraysEXT and glDrawElements calls,
-          so we'd pass data to host right before the glDrawSomething call.
+          so we'd pass data to host right before the glDrawSomething or glBegin call.
         */
         /*crPackLockArraysEXT(first, count);*/