Changeset 32327 in vbox for trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_client.c

Timestamp:

Sep 8, 2010 4:08:27 PM (14 years ago)

Author:

vboxsync

Message:

crOpenGL: don't unroll primitives when possible

File:

• trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_client.c (modified) (6 diffs)

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

@@ -228 +228 @@
 #if CR_ARB_vertex_buffer_object
     GET_CONTEXT(ctx);
+    GLboolean lockedArrays = GL_FALSE;
+    CRBufferObject *elementsBuffer = crStateGetCurrent()->bufferobject.elementsBuffer;
     /*crDebug("DrawElements count=%d, indices=%p", count, indices);*/
     if (ctx->clientState->extensions.ARB_vertex_buffer_object)
         serverArrays = crStateUseServerArrays();
+
+    if (!serverArrays && !ctx->clientState->client.array.locked && (count>3)
+        && (!elementsBuffer || !elementsBuffer->id))
+    {
+        GLuint min, max;
+        GLsizei i;
+
+        switch (type)
+        {
+            case GL_UNSIGNED_BYTE:
+            {
+                GLubyte *pIdx = (GLubyte *)indices;
+                min = max = pIdx[0];
+                for (i=0; i<count; ++i)
+                {
+                    if (pIdx[i]<min) min = pIdx[i];
+                    else if (pIdx[i]>max) max = pIdx[i];
+                }
+                break;
+            }
+            case GL_UNSIGNED_SHORT:
+            {
+                GLushort *pIdx = (GLushort *)indices;
+                min = max = pIdx[0];
+                for (i=0; i<count; ++i)
+                {
+                    if (pIdx[i]<min) min = pIdx[i];
+                    else if (pIdx[i]>max) max = pIdx[i];
+                }
+                break;
+            }
+            case GL_UNSIGNED_INT:
+            {
+                GLuint *pIdx = (GLuint *)indices;
+                min = max = pIdx[0];
+                for (i=0; i<count; ++i)
+                {
+                    if (pIdx[i]<min) min = pIdx[i];
+                    else if (pIdx[i]>max) max = pIdx[i];
+                }
+                break;
+            }
+            default: crError("Unknown type 0x%x", type);
+        }
+
+        if ((max-min)<(GLuint)(2*count))
+        {
+            crStateLockArraysEXT(min, max-min+1);
+
+            serverArrays = crStateUseServerArrays();
+            if (serverArrays)
+            {
+                lockedArrays = GL_TRUE;
+            }
+            else
+            {
+                crStateUnlockArraysEXT();
+            }
+        }
+    }
 #endif
 
@@ -243 +305 @@
             clientState->array.synced = GL_TRUE;
         }
-        
         /* Send the DrawArrays command over the wire */
         if (pack_spu.swap)
@@ -263 +324 @@
         }
     }
+
+#if CR_ARB_vertex_buffer_object
+    if (lockedArrays)
+    {
+        packspu_UnlockArraysEXT();
+    }
+#endif
 }
 
@@ -316 +384 @@
 #if CR_ARB_vertex_buffer_object
     GET_CONTEXT(ctx);
+    GLboolean lockedArrays = GL_FALSE;
     /*crDebug("DrawArrays count=%d", count);*/
     if (ctx->clientState->extensions.ARB_vertex_buffer_object)
          serverArrays = crStateUseServerArrays();
-#endif
-
-    if (serverArrays) {
+
+    if (!serverArrays && !ctx->clientState->client.array.locked && (count>3))
+    {
+        crStateLockArraysEXT(first, count);
+        serverArrays = crStateUseServerArrays();
+        if (serverArrays)
+        {
+            lockedArrays = GL_TRUE;
+        }
+        else
+        {
+            crStateUnlockArraysEXT();
+        }
+    }
+#endif
+
+    if (serverArrays)
+    {
         GET_CONTEXT(ctx);
         CRClientState *clientState = &(ctx->clientState->client);
@@ -338 +422 @@
             crPackDrawArrays( mode, first, count );
     }
-    else {
+    else
+    {
         /* evaluate locally */
         GET_CONTEXT(ctx);
@@ -347 +432 @@
             crPackExpandDrawArrays( mode, first, count, clientState );
     }
+
+#if CR_ARB_vertex_buffer_object
+    if (lockedArrays)
+    {
+        packspu_UnlockArraysEXT();
+    }
+#endif
 }