Changeset 78375 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_context.cpp

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/HostServices/SharedOpenGL/crserverlib/server_context.cpp (modified) (8 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_context.cpp

@@ -63 +63 @@
             return -1;
         }
-        cr_server.MainContextInfo.pContext = crStateCreateContext(&cr_server.limits, visualBits, NULL);
+        cr_server.MainContextInfo.pContext = crStateCreateContext(&cr_server.StateTracker, &cr_server.limits, visualBits, NULL);
         CRASSERT(cr_server.MainContextInfo.pContext);
         cr_server.firstCallCreateContext = GL_FALSE;
@@ -114 +114 @@
         if (pContextInfo->SpuContext < 0) {
             crWarning("crServerDispatchCreateContext() failed.");
-            crStateEnableDiffOnMakeCurrent(GL_TRUE);
+            crStateEnableDiffOnMakeCurrent(&cr_server.StateTracker, GL_TRUE);
             cr_server.bUseMultipleContexts = GL_FALSE;
             if (!fFirst)
@@ -121 +121 @@
         else if (fFirst)
         {
-            crStateEnableDiffOnMakeCurrent(GL_FALSE);
+            crStateEnableDiffOnMakeCurrent(&cr_server.StateTracker, GL_FALSE);
         }
     }
@@ -132 +132 @@
      * dispatch function pointers.
      */
-    newCtx = crStateCreateContextEx(&cr_server.limits, visualBits, NULL, internalID);
+    newCtx = crStateCreateContextEx(&cr_server.StateTracker, &cr_server.limits, visualBits, NULL, internalID);
     if (newCtx) {
-        crStateSetCurrentPointers( newCtx, &(cr_server.current) );
+        crStateSetCurrentPointers(newCtx, &(cr_server.current) );
         crStateResetCurrentPointers(&(cr_server.current));
         retVal = preloadCtxID<0 ? (GLint)crHashtableAllocKeys( cr_server.contextTable, 1 ) : preloadCtxID;
@@ -214 +214 @@
     crCtxInfo->currentMural = NULL;
     crHashtableDelete(cr_server.contextTable, ctx, NULL);
-    crStateDestroyContext( crCtx );
+    crStateDestroyContext(&cr_server.StateTracker, crCtx);
 
     if (crCtxInfo->CreateInfo.pszDpyName)
@@ -306 +306 @@
      * crStateSwitchPrepare restores the FBO state to its default values before the context window switch,
      * while crStateSwitchPostprocess restores it back to the original values */
-    oldCtx = crStateGetCurrent();
+    oldCtx = crStateGetCurrent(&cr_server.StateTracker);
     if (oldMural && oldMural->fRedirected && crServerSupportRedirMuralFBO())
     {
@@ -335 +335 @@
 
     /* This is a hack to force updating the 'current' attribs */
-    crStateUpdateColorBits();
+    crStateUpdateColorBits(&cr_server.StateTracker);
 
     if (ctx)
-        crStateSetCurrentPointers( ctx, &(cr_server.current) );
+        crStateSetCurrentPointers(ctx, &(cr_server.current) );
 
     /* check if being made current for first time, update viewport */
@@ -387 +387 @@
 
     /* This used to be earlier, after crStateUpdateColorBits() call */
-    crStateMakeCurrent( ctx );
+    crStateMakeCurrent(&cr_server.StateTracker, ctx );
 
     if (mural && mural->fRedirected  && crServerSupportRedirMuralFBO())