Changeset 78375 in vbox for trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_current.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/GuestHost/OpenGL/state_tracker/state_current.c (modified) (27 diffs)

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_current.c

@@ -19 +19 @@
 {
     CRCurrentState *c = &ctx->current;
-    CRStateBits *sb = GetCurrentBits();
+    CRStateBits *sb = GetCurrentBits(ctx->pStateTracker);
     CRCurrentBits *cb = &(sb->current);
     static const GLfloat default_normal[4]         = {0.0f, 0.0f, 1.0f, 1.0f};
@@ -70 +70 @@
 }
 
-void STATE_APIENTRY crStateColor3f( GLfloat r, GLfloat g, GLfloat b )
-{
-    crStateColor4f(r, g, b, 1.0F);
-}
-
-void STATE_APIENTRY crStateColor3fv( const GLfloat *color )
-{
-    crStateColor4f( color[0], color[1], color[2], 1.0F );
-}
-
-void STATE_APIENTRY crStateColor4f( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
-{
-    CRContext *g = GetCurrentContext();
+void STATE_APIENTRY crStateColor3f(PCRStateTracker pState, GLfloat r, GLfloat g, GLfloat b )
+{
+    crStateColor4f(pState, r, g, b, 1.0F);
+}
+
+void STATE_APIENTRY crStateColor3fv(PCRStateTracker pState, const GLfloat *color )
+{
+    crStateColor4f(pState, color[0], color[1], color[2], 1.0F );
+}
+
+void STATE_APIENTRY crStateColor4f(PCRStateTracker pState, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
+{
+    CRContext *g = GetCurrentContext(pState);
     CRCurrentState *c = &(g->current);
-    CRStateBits *sb = GetCurrentBits();
+    CRStateBits *sb = GetCurrentBits(pState);
     CRCurrentBits *cb = &(sb->current);
 
@@ -98 +98 @@
 }
 
-void STATE_APIENTRY crStateColor4fv( const GLfloat *color )
-{
-    crStateColor4f( color[0], color[1], color[2], color[3] );
+void STATE_APIENTRY crStateColor4fv(PCRStateTracker pState, const GLfloat *color )
+{
+    crStateColor4f(pState, color[0], color[1], color[2], color[3] );
 }
 
@@ -118 +118 @@
 }
 
-void STATE_APIENTRY crStateBegin( GLenum mode )
-{
-    CRContext *g = GetCurrentContext();
+void STATE_APIENTRY crStateBegin(PCRStateTracker pState, GLenum mode )
+{
+    CRContext *g = GetCurrentContext(pState);
     CRCurrentState *c = &(g->current);
 
     if (mode > GL_POLYGON)
     {
-        crStateError(__LINE__, __FILE__, GL_INVALID_ENUM, "Begin called with invalid mode: %d", mode);
+        crStateError(pState, __LINE__, __FILE__, GL_INVALID_ENUM, "Begin called with invalid mode: %d", mode);
         return;
     }
@@ -131 +131 @@
     if (c->inBeginEnd)
     {
-        crStateError( __LINE__, __FILE__, GL_INVALID_OPERATION, "glBegin called inside Begin/End");
+        crStateError(pState, __LINE__, __FILE__, GL_INVALID_OPERATION, "glBegin called inside Begin/End");
         return;
     }
@@ -141 +141 @@
 }
 
-void STATE_APIENTRY crStateEnd( void )
-{
-    CRContext *g = GetCurrentContext();
+void STATE_APIENTRY crStateEnd(PCRStateTracker pState)
+{
+    CRContext *g = GetCurrentContext(pState);
     CRCurrentState *c = &(g->current);
 
     if (!c->inBeginEnd)
     {
-        crStateError( __LINE__, __FILE__, GL_INVALID_OPERATION, "glEnd called outside Begin/End" );
+        crStateError(pState, __LINE__, __FILE__, GL_INVALID_OPERATION, "glEnd called outside Begin/End" );
         return;
     }
@@ -158 +158 @@
                                                      CRContext *fromCtx, CRContext *toCtx )
 {
+    PCRStateTracker pState = fromCtx->pStateTracker;
     const CRCurrentState *from = &(fromCtx->current);
     const CRCurrentState *to = &(toCtx->current);
@@ -163 +164 @@
     unsigned int i, j;
     CRbitvalue nbitID[CR_MAX_BITARRAY];
+
+    CRASSERT(fromCtx->pStateTracker == toCtx->pStateTracker);
 
     for (j=0;j<CR_MAX_BITARRAY;j++)
@@ -177 +180 @@
           if (toX != fromX || toY != fromY || toZ != fromZ) {
                 /* Use glWindowPos (which updates raster color) */
-                diff_api.WindowPos3fvARB(to->rasterAttrib[VERT_ATTRIB_POS]);
+                pState->diff_api.WindowPos3fvARB(to->rasterAttrib[VERT_ATTRIB_POS]);
               FILLDIRTY(c->rasterPos);
               FILLDIRTY(c->dirty);
@@ -195 +198 @@
     if (CHECKDIRTY(c->colorIndex, bitID)) {
         if (to->colorIndex != from->colorIndex) {
-            diff_api.Indexf(to->colorIndex);
+            pState->diff_api.Indexf(to->colorIndex);
             FILLDIRTY(c->colorIndex);
             FILLDIRTY(c->dirty);
@@ -204 +207 @@
     if (CHECKDIRTY(c->edgeFlag, bitID)) {
         if (to->edgeFlag != from->edgeFlag) {
-            diff_api.EdgeFlag(to->edgeFlag);
+            pState->diff_api.EdgeFlag(to->edgeFlag);
             FILLDIRTY(c->edgeFlag);
             FILLDIRTY(c->dirty);
@@ -223 +226 @@
                     && CHECKDIRTY(c->vertexAttrib[i], bitID)) {
                 if (COMPARE_VECTOR (from->vertexAttrib[i], to->vertexAttribPre[i])) {
-                    diff_api.VertexAttrib4fvARB(i, &(to->vertexAttrib[i][0]));
+                    pState->diff_api.VertexAttrib4fvARB(i, &(to->vertexAttrib[i][0]));
                     FILLDIRTY(c->vertexAttrib[i]);
                     FILLDIRTY(c->dirty);
@@ -242 +245 @@
         if (CHECKDIRTY(c->vertexAttrib[VERT_ATTRIB_COLOR0], bitID)) {
             if (COMPARE_COLOR(from->vertexAttrib[VERT_ATTRIB_COLOR0],to->vertexAttrib[VERT_ATTRIB_COLOR0])) {
-                diff_api.Color4fv ((GLfloat *) &(to->vertexAttrib[VERT_ATTRIB_COLOR0]));
+                pState->diff_api.Color4fv ((GLfloat *) &(to->vertexAttrib[VERT_ATTRIB_COLOR0]));
                 FILLDIRTY(c->vertexAttrib[VERT_ATTRIB_COLOR0]);
                 FILLDIRTY(c->dirty);
@@ -253 +256 @@
         if (CHECKDIRTY(c->vertexAttrib[VERT_ATTRIB_COLOR1], bitID)) {
             if (COMPARE_COLOR(from->vertexAttrib[VERT_ATTRIB_COLOR1],to->vertexAttrib[VERT_ATTRIB_COLOR1])) {
-                diff_api.SecondaryColor3fvEXT ((GLfloat *) &(to->vertexAttrib[VERT_ATTRIB_COLOR1]));
+                pState->diff_api.SecondaryColor3fvEXT ((GLfloat *) &(to->vertexAttrib[VERT_ATTRIB_COLOR1]));
                 FILLDIRTY(c->vertexAttrib[VERT_ATTRIB_COLOR1]);
                 FILLDIRTY(c->dirty);
@@ -265 +268 @@
         if (CHECKDIRTY(c->vertexAttrib[VERT_ATTRIB_FOG], bitID)) {
             if (from->vertexAttrib[VERT_ATTRIB_FOG][0] != to->vertexAttrib[VERT_ATTRIB_FOG][0] ) {
-                diff_api.FogCoordfvEXT ((GLfloat *) &(to->vertexAttrib[VERT_ATTRIB_FOG][0] ));
+                pState->diff_api.FogCoordfvEXT ((GLfloat *) &(to->vertexAttrib[VERT_ATTRIB_FOG][0] ));
                 FILLDIRTY(c->vertexAttrib[VERT_ATTRIB_FOG]);
                 FILLDIRTY(c->dirty);
@@ -275 +278 @@
         if (CHECKDIRTY(c->vertexAttrib[VERT_ATTRIB_NORMAL], bitID)) {
             if (COMPARE_VECTOR (from->vertexAttrib[VERT_ATTRIB_NORMAL], to->vertexAttrib[VERT_ATTRIB_NORMAL])) {
-                diff_api.Normal3fv ((GLfloat *) &(to->vertexAttrib[VERT_ATTRIB_NORMAL][0]));
+                pState->diff_api.Normal3fv ((GLfloat *) &(to->vertexAttrib[VERT_ATTRIB_NORMAL][0]));
                 FILLDIRTY(c->vertexAttrib[VERT_ATTRIB_NORMAL]);
                 FILLDIRTY(c->dirty);
@@ -285 +288 @@
             if (CHECKDIRTY(c->vertexAttrib[VERT_ATTRIB_TEX0 + i], bitID)) {
                 if (COMPARE_TEXCOORD (from->vertexAttrib[VERT_ATTRIB_TEX0 + i], to->vertexAttribPre[VERT_ATTRIB_TEX0 + i])) {
-                    diff_api.MultiTexCoord4fvARB (i+GL_TEXTURE0_ARB, (GLfloat *) &(to->vertexAttrib[VERT_ATTRIB_TEX0+ i][0]));
+                    pState->diff_api.MultiTexCoord4fvARB (i+GL_TEXTURE0_ARB, (GLfloat *) &(to->vertexAttrib[VERT_ATTRIB_TEX0+ i][0]));
                     FILLDIRTY(c->vertexAttrib[VERT_ATTRIB_TEX0 + i]);
                     FILLDIRTY(c->dirty);
@@ -301 +304 @@
                     CRContext *fromCtx, CRContext *toCtx )
 {
+    PCRStateTracker pState = fromCtx->pStateTracker;
     CRCurrentState *from = &(fromCtx->current);
     const CRCurrentState *to = &(toCtx->current);
     unsigned int i, j;
     CRbitvalue nbitID[CR_MAX_BITARRAY];
+
+    CRASSERT(fromCtx->pStateTracker == toCtx->pStateTracker);
 
     for (j=0;j<CR_MAX_BITARRAY;j++)
@@ -320 +326 @@
             if (toX != fromX || toY != fromY || toZ != fromZ) {
                 /* Use glWindowPos (which updates raster color) */
-                diff_api.WindowPos3fvARB(to->rasterAttrib[VERT_ATTRIB_POS]);
+                pState->diff_api.WindowPos3fvARB(to->rasterAttrib[VERT_ATTRIB_POS]);
                 from->rasterAttrib[VERT_ATTRIB_POS][0] = toX;
                 from->rasterAttrib[VERT_ATTRIB_POS][1] = toY;
@@ -342 +348 @@
     if (CHECKDIRTY(c->edgeFlag, bitID)) {
         if (from->edgeFlag != to->edgeFlagPre) {
-            diff_api.EdgeFlag (to->edgeFlagPre);
+            pState->diff_api.EdgeFlag (to->edgeFlagPre);
         }
         from->edgeFlag = to->edgeFlag;
@@ -351 +357 @@
     if (CHECKDIRTY(c->colorIndex, bitID)) {
         if (from->colorIndex != to->colorIndexPre) {
-            diff_api.Indexf (to->colorIndex);
+            pState->diff_api.Indexf (to->colorIndex);
         }
         from->colorIndex = to->colorIndex;
@@ -370 +376 @@
                     && CHECKDIRTY(c->vertexAttrib[i], bitID)) {
                 if (COMPARE_VECTOR (from->vertexAttrib[i], to->vertexAttribPre[i])) {
-                    diff_api.VertexAttrib4fvARB(i, &(to->vertexAttribPre[i][0]));
+                    pState->diff_api.VertexAttrib4fvARB(i, &(to->vertexAttribPre[i][0]));
                 }
                 COPY_4V(from->vertexAttrib[i] , to->vertexAttrib[i]);
@@ -386 +392 @@
         if (CHECKDIRTY(c->vertexAttrib[VERT_ATTRIB_COLOR0], bitID)) {
             if (COMPARE_COLOR(from->vertexAttrib[VERT_ATTRIB_COLOR0],to->vertexAttribPre[VERT_ATTRIB_COLOR0])) {
-                diff_api.Color4fv ((GLfloat *) &(to->vertexAttribPre[VERT_ATTRIB_COLOR0]));
+                pState->diff_api.Color4fv ((GLfloat *) &(to->vertexAttribPre[VERT_ATTRIB_COLOR0]));
             }
             COPY_4V(from->vertexAttrib[VERT_ATTRIB_COLOR0] , to->vertexAttrib[VERT_ATTRIB_COLOR0]);
@@ -395 +401 @@
         if (CHECKDIRTY(c->vertexAttrib[VERT_ATTRIB_COLOR1], bitID)) {
             if (COMPARE_COLOR(from->vertexAttrib[VERT_ATTRIB_COLOR1],to->vertexAttribPre[VERT_ATTRIB_COLOR1])) {
-                diff_api.SecondaryColor3fvEXT ((GLfloat *) &(to->vertexAttribPre[VERT_ATTRIB_COLOR1]));
+                pState->diff_api.SecondaryColor3fvEXT ((GLfloat *) &(to->vertexAttribPre[VERT_ATTRIB_COLOR1]));
             }
             COPY_4V(from->vertexAttrib[VERT_ATTRIB_COLOR1] , to->vertexAttrib[VERT_ATTRIB_COLOR1]);
@@ -405 +411 @@
         if (CHECKDIRTY(c->vertexAttrib[VERT_ATTRIB_FOG], bitID)) {
             if (from->vertexAttrib[VERT_ATTRIB_FOG]  != to->vertexAttribPre[VERT_ATTRIB_FOG]) {
-                diff_api.FogCoordfvEXT ((GLfloat *) &(to->vertexAttribPre[VERT_ATTRIB_FOG]));
+                pState->diff_api.FogCoordfvEXT ((GLfloat *) &(to->vertexAttribPre[VERT_ATTRIB_FOG]));
             }
             COPY_4V(from->vertexAttrib[VERT_ATTRIB_FOG]  , to->vertexAttrib[VERT_ATTRIB_FOG]);
@@ -414 +420 @@
         if (CHECKDIRTY(c->vertexAttrib[VERT_ATTRIB_NORMAL], bitID)) {
             if (COMPARE_VECTOR (from->vertexAttrib[VERT_ATTRIB_NORMAL], to->vertexAttribPre[VERT_ATTRIB_NORMAL])) {
-                diff_api.Normal3fv ((GLfloat *) &(to->vertexAttribPre[VERT_ATTRIB_NORMAL]));
+                pState->diff_api.Normal3fv ((GLfloat *) &(to->vertexAttribPre[VERT_ATTRIB_NORMAL]));
             }
             COPY_4V(from->vertexAttrib[VERT_ATTRIB_NORMAL] , to->vertexAttrib[VERT_ATTRIB_NORMAL]);
@@ -424 +430 @@
             if (CHECKDIRTY(c->vertexAttrib[VERT_ATTRIB_TEX0 + i], bitID)) {
                 if (COMPARE_TEXCOORD (from->vertexAttrib[VERT_ATTRIB_TEX0 + i], to->vertexAttribPre[VERT_ATTRIB_TEX0 + i])) {
-                    diff_api.MultiTexCoord4fvARB (GL_TEXTURE0_ARB + i, (GLfloat *) &(to->vertexAttribPre[VERT_ATTRIB_TEX0 + i]));
+                    pState->diff_api.MultiTexCoord4fvARB (GL_TEXTURE0_ARB + i, (GLfloat *) &(to->vertexAttribPre[VERT_ATTRIB_TEX0 + i]));
                 }
                 COPY_4V(from->vertexAttrib[VERT_ATTRIB_TEX0 + i] , to->vertexAttrib[VERT_ATTRIB_TEX0 + i]);