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

Timestamp:

May 3, 2019 9:51:02 PM (6 years ago)

Author:

vboxsync

Message:

Additions/common/crOpengl,GuestHost/OpenGL,HostServices/SharedOpenGL: Eliminate all global variables from the state tracker library (state_tracker) in preparation of the SPU DLL merging, bugref:9435

File:

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

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

@@ -19 +19 @@
     }
 #endif
-    crStateFogCoordPointerEXT( type, stride, pointer );
+    crStateFogCoordPointerEXT(&pack_spu.StateTracker, type, stride, pointer );
 }
 
@@ -30 +30 @@
     }
 #endif
-    crStateColorPointer( size, type, stride, pointer );
+    crStateColorPointer(&pack_spu.StateTracker, size, type, stride, pointer );
 }
 
@@ -41 +41 @@
     }
 #endif
-    crStateSecondaryColorPointerEXT( size, type, stride, pointer );
+    crStateSecondaryColorPointerEXT(&pack_spu.StateTracker, size, type, stride, pointer );
 }
 
@@ -53 +53 @@
     }
 #endif
-    crStateVertexPointer( size, type, stride, pointer );
+    crStateVertexPointer(&pack_spu.StateTracker, size, type, stride, pointer );
 }
 
@@ -64 +64 @@
     }
 #endif
-    crStateTexCoordPointer( size, type, stride, pointer );
+    crStateTexCoordPointer(&pack_spu.StateTracker, size, type, stride, pointer );
 }
 
@@ -75 +75 @@
     }
 #endif
-    crStateNormalPointer( type, stride, pointer );
+    crStateNormalPointer(&pack_spu.StateTracker, type, stride, pointer );
 }
 
@@ -86 +86 @@
     }
 #endif
-    crStateEdgeFlagPointer( stride, pointer );
+    crStateEdgeFlagPointer(&pack_spu.StateTracker, stride, pointer );
 }
 
@@ -97 +97 @@
     }
 #endif
-    crStateVertexAttribPointerARB( index, size, type, normalized, stride, pointer );
+    crStateVertexAttribPointerARB(&pack_spu.StateTracker, index, size, type, normalized, stride, pointer );
 }
 
@@ -108 +108 @@
     }
 #endif
-    crStateVertexAttribPointerNV( index, size, type, stride, pointer );
+    crStateVertexAttribPointerNV(&pack_spu.StateTracker, index, size, type, stride, pointer );
 }
 
@@ -119 +119 @@
     }
 #endif
-    crStateIndexPointer(type, stride, pointer);
+    crStateIndexPointer(&pack_spu.StateTracker, type, stride, pointer);
 }
 
 void PACKSPU_APIENTRY packspu_GetPointerv( GLenum pname, GLvoid **params )
 {
-    crStateGetPointerv( pname, params );
+    crStateGetPointerv(&pack_spu.StateTracker, pname, params );
 }
 
@@ -138 +138 @@
     /*crDebug("packspu_InterleavedArrays");*/
 
-    crStateInterleavedArrays( format, stride, pointer );
+    crStateInterleavedArrays(&pack_spu.StateTracker, format, stride, pointer );
 }
 
@@ -219 +219 @@
 #ifdef DEBUG
     {
-        CRContext *pCurState = crStateGetCurrent();
+        CRContext *pCurState = crStateGetCurrent(&pack_spu.StateTracker);
 
         Assert(g == pCurState);
@@ -282 +282 @@
     {
         CRContext *g = pRestoreCtx->pCtx->clientState;
-        CRContext *pCurState = crStateGetCurrent();
+        CRContext *pCurState = crStateGetCurrent(&pack_spu.StateTracker);
 
         Assert(g == pCurState);
@@ -319 +319 @@
         if (ctx->clientState->extensions.ARB_vertex_buffer_object)
         {
-            serverArrays = crStateUseServerArrays();
+            serverArrays = crStateUseServerArrays(&pack_spu.StateTracker);
             if (ctx->fCheckZerroVertAttr)
                 cZvaValues = crStateNeedDummyZeroVertexArray(thread->currentContext->clientState, &thread->packer->current, aAttrib);
@@ -395 +395 @@
     {
         GET_CONTEXT(ctx);
-        elementsBuffer = crStateGetCurrent()->bufferobject.elementsBuffer;
+        elementsBuffer = crStateGetCurrent(&pack_spu.StateTracker)->bufferobject.elementsBuffer;
         /*crDebug("DrawElements count=%d, indices=%p", count, indices);*/
         if (ctx->clientState->extensions.ARB_vertex_buffer_object)
         {
-            serverArrays = crStateUseServerArrays();
+            serverArrays = crStateUseServerArrays(&pack_spu.StateTracker);
             if (ctx->fCheckZerroVertAttr)
                 cZvaValues = crStateNeedDummyZeroVertexArray(thread->currentContext->clientState, &thread->packer->current, aAttrib);
@@ -452 +452 @@
         if ((max-min)<(GLuint)(2*count))
         {
-            crStateLockArraysEXT(min, max-min+1);
+            crStateLockArraysEXT(&pack_spu.StateTracker, min, max-min+1);
 
             serverArrays = crStateUseServerArrays();
@@ -461 +461 @@
             else
             {
-                crStateUnlockArraysEXT();
+                crStateUnlockArraysEXT(&pack_spu.StateTracker);
             }
         }
@@ -539 +539 @@
         if (ctx->clientState->extensions.ARB_vertex_buffer_object)
         {
-             serverArrays = crStateUseServerArrays();
+             serverArrays = crStateUseServerArrays(&pack_spu.StateTracker);
              if (ctx->fCheckZerroVertAttr)
                  cZvaValues = crStateNeedDummyZeroVertexArray(thread->currentContext->clientState, &thread->packer->current, aAttrib);
@@ -608 +608 @@
         if (ctx->clientState->extensions.ARB_vertex_buffer_object)
         {
-             serverArrays = crStateUseServerArrays();
+             serverArrays = crStateUseServerArrays(&pack_spu.StateTracker);
              if (ctx->fCheckZerroVertAttr)
                  cZvaValues = crStateNeedDummyZeroVertexArray(thread->currentContext->clientState, &thread->packer->current, aAttrib);
@@ -617 +617 @@
     if (!serverArrays && !ctx->clientState->client.array.locked && (count>3))
     {
-        crStateLockArraysEXT(first, count);
-        serverArrays = crStateUseServerArrays();
+        crStateLockArraysEXT(&pack_spu.StateTracker, first, count);
+        serverArrays = crStateUseServerArrays(&pack_spu.StateTracker);
         if (serverArrays)
         {
@@ -625 +625 @@
         else
         {
-            crStateUnlockArraysEXT();
+            crStateUnlockArraysEXT(&pack_spu.StateTracker);
         }
     }
@@ -714 +714 @@
 void PACKSPU_APIENTRY packspu_EnableClientState( GLenum array )
 {
-    crStateEnableClientState(array);
+    crStateEnableClientState(&pack_spu.StateTracker, array);
     crPackEnableClientState(array);
 }
@@ -720 +720 @@
 void PACKSPU_APIENTRY packspu_DisableClientState( GLenum array )
 {
-    crStateDisableClientState(array);
+    crStateDisableClientState(&pack_spu.StateTracker, array);
     crPackDisableClientState(array);
 }
@@ -726 +726 @@
 void PACKSPU_APIENTRY packspu_ClientActiveTextureARB( GLenum texUnit )
 {
-    crStateClientActiveTextureARB(texUnit);
+    crStateClientActiveTextureARB(&pack_spu.StateTracker, texUnit);
     crPackClientActiveTextureARB(texUnit);
 }
@@ -732 +732 @@
 void PACKSPU_APIENTRY packspu_EnableVertexAttribArrayARB(GLuint index)
 {
-    crStateEnableVertexAttribArrayARB(index);
+    crStateEnableVertexAttribArrayARB(&pack_spu.StateTracker, index);
     crPackEnableVertexAttribArrayARB(index);
 }
@@ -739 +739 @@
 void PACKSPU_APIENTRY packspu_DisableVertexAttribArrayARB(GLuint index)
 {
-    crStateDisableVertexAttribArrayARB(index);
+    crStateDisableVertexAttribArrayARB(&pack_spu.StateTracker, index);
     crPackDisableVertexAttribArrayARB(index);
 }
@@ -747 +747 @@
     if (cap!=GL_LIGHT_MODEL_TWO_SIDE)
     {
-        crStateEnable(cap);
+        crStateEnable(&pack_spu.StateTracker, cap);
         crPackEnable(cap);
     }
@@ -758 +758 @@
             g_glmts1_warn=1;
         }
-        crStateLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 1);
+        crStateLightModeli(&pack_spu.StateTracker, GL_LIGHT_MODEL_TWO_SIDE, 1);
         crPackLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 1);
     }
@@ -768 +768 @@
     if (cap!=GL_LIGHT_MODEL_TWO_SIDE)
     {
-        crStateDisable(cap);
+        crStateDisable(&pack_spu.StateTracker, cap);
         crPackDisable(cap);
     }
@@ -779 +779 @@
             g_glmts0_warn=1;
         }
-        crStateLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 0);
+        crStateLightModeli(&pack_spu.StateTracker, GL_LIGHT_MODEL_TWO_SIDE, 0);
         crPackLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 0);
     }
@@ -786 +786 @@
 GLboolean PACKSPU_APIENTRY packspu_IsEnabled(GLenum cap)
 {
-    GLboolean res = crStateIsEnabled(cap);
+    GLboolean res = crStateIsEnabled(&pack_spu.StateTracker, cap);
 #ifdef DEBUG
     {
@@ -804 +804 @@
 void PACKSPU_APIENTRY packspu_PushClientAttrib( GLbitfield mask )
 {
-    crStatePushClientAttrib(mask);
+    crStatePushClientAttrib(&pack_spu.StateTracker, mask);
     crPackPushClientAttrib(mask);
 }
@@ -810 +810 @@
 void PACKSPU_APIENTRY packspu_PopClientAttrib( void )
 {
-    crStatePopClientAttrib();
+    crStatePopClientAttrib(&pack_spu.StateTracker);
     crPackPopClientAttrib();
 }
@@ -818 +818 @@
     if (first>=0 && count>0)
     {
-        crStateLockArraysEXT(first, count);
+        crStateLockArraysEXT(&pack_spu.StateTracker, first, count);
         /*Note: this is a workaround for quake3 based apps.
           It's modifying vertex data between glLockArraysEXT and glDrawElements calls,
@@ -838 +838 @@
     }
 
-    crStateUnlockArraysEXT();
-}
+    crStateUnlockArraysEXT(&pack_spu.StateTracker);
+}