Changeset 22284 in vbox for trunk/src/VBox/Additions/common/crOpenGL

Timestamp:

Aug 17, 2009 8:44:47 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: add compiled vertex array support

Location:

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

Files:

• packspu_client.c (modified) (6 diffs)
• packspu_special (modified) (2 diffs)

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

@@ -137 +137 @@
 }
 
+void PACKSPU_APIENTRY packspu_IndexPointer( GLenum type, GLsizei stride, const GLvoid *pointer )
+{
+#if CR_ARB_vertex_buffer_object
+    GET_CONTEXT(ctx);
+    if (ctx->clientState->extensions.ARB_vertex_buffer_object) {
+        if (pack_spu.swap)
+            crPackIndexPointerSWAP( type, stride, pointer );
+        else
+            crPackIndexPointer( type, stride, pointer );
+    }
+#endif
+    crStateIndexPointer(type, stride, pointer);
+}
+
 void PACKSPU_APIENTRY packspu_GetPointerv( GLenum pname, GLvoid **params )
 {
@@ -175 +189 @@
 
     if (serverArrays) {
+        GET_CONTEXT(ctx);
+        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;
+        }
+
         /* Send the DrawArrays command over the wire */
         if (pack_spu.swap)
@@ -211 +235 @@
 
     if (serverArrays) {
+        GET_CONTEXT(ctx);
+        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;
+        }
+        
         /* Send the DrawArrays command over the wire */
         if (pack_spu.swap)
@@ -246 +280 @@
 
     if (serverArrays) {
+        GET_CONTEXT(ctx);
+        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;
+        }
+
         /* Send the DrawRangeElements command over the wire */
         if (pack_spu.swap)
@@ -279 +323 @@
 
     if (serverArrays) {
+        GET_CONTEXT(ctx);
+        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;
+        }
+
         /* Send the DrawArrays command over the wire */
         if (pack_spu.swap)
@@ -402 +456 @@
     crPackPopClientAttrib();
 }
+
+void PACKSPU_APIENTRY packspu_LockArraysEXT(GLint first, GLint count)
+{
+    if (first>=0 && count>0)
+    {
+        crStateLockArraysEXT(first, count);
+        /*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.
+        */
+        /*crPackLockArraysEXT(first, count);*/
+    } 
+    else crDebug("Ignoring packspu_LockArraysEXT: first:%i, count:%i", first, count);
+}
+
+void PACKSPU_APIENTRY packspu_UnlockArraysEXT()
+{
+    crStateUnlockArraysEXT();
+    crPackUnlockArraysEXT();
+}

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

@@ -22 +22 @@
 TexCoordPointer
 EdgeFlagPointer
+IndexPointer
 ArrayElement
 DrawArrays
@@ -77 +78 @@
 GetBufferSubDataARB
 IsEnabled
+LockArraysEXT
+UnlockArraysEXT