Changeset 78375 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_misc.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_misc.cpp (modified) (13 diffs)

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

@@ -328 +328 @@
   switch (target) {
     case GL_SHARE_CONTEXT_RESOURCES_CR:
-        crStateShareContext(value);
+        crStateShareContext(&cr_server.StateTracker, value);
         break;
     case GL_RCUSAGE_TEXTURE_SET_CR:
-        crStateSetTextureUsed(value, GL_TRUE);
+        crStateSetTextureUsed(&cr_server.StateTracker, value, GL_TRUE);
         break;
     case GL_RCUSAGE_TEXTURE_CLEAR_CR:
-        crStateSetTextureUsed(value, GL_FALSE);
+        crStateSetTextureUsed(&cr_server.StateTracker, value, GL_FALSE);
         break;
     case GL_PIN_TEXTURE_SET_CR:
-        crStatePinTexture(value, GL_TRUE);
+        crStatePinTexture(&cr_server.StateTracker, value, GL_TRUE);
         break;
     case GL_PIN_TEXTURE_CLEAR_CR:
-        crStatePinTexture(value, GL_FALSE);
+        crStatePinTexture(&cr_server.StateTracker, value, GL_FALSE);
         break;
     case GL_SHARED_DISPLAY_LISTS_CR:
@@ -502 +502 @@
             GLuint tID, fboID;
             GLenum status;
-            CRContext *ctx = crStateGetCurrent();
+            CRContext *ctx = crStateGetCurrent(&cr_server.StateTracker);
 
             gl->GenTextures(1, &tID);
@@ -601 +601 @@
             GLint dRow;
             GLuint pboId, sRow;
-            CRContext *ctx = crStateGetCurrent();
+            CRContext *ctx = crStateGetCurrent(&cr_server.StateTracker);
 
             gl->GenBuffersARB(1, &pboId);
@@ -897 +897 @@
     CR_BLITTER_CONTEXT Ctx;
     CRMuralInfo *mural;
-    CRContext *ctx = crStateGetCurrent();
+    CRContext *ctx = crStateGetCurrent(&cr_server.StateTracker);
     PVBOXVR_TEXTURE pDrawTex, pReadTex;
     VBOXVR_TEXTURE DrawTex, ReadTex;
@@ -992 +992 @@
                                    GLbitfield mask, GLenum filter)
 {
-    CRContext *ctx = crStateGetCurrent();
+    CRContext *ctx = crStateGetCurrent(&cr_server.StateTracker);
     bool fTryBlitter = false;
 #ifdef CR_CHECK_BLITS
@@ -1274 +1274 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchDrawBuffer( GLenum mode )
 {
-    crStateDrawBuffer( mode );
-
-    if (!crStateGetCurrent()->framebufferobject.drawFB)
+    crStateDrawBuffer(&cr_server.StateTracker, mode );
+
+    if (!crStateGetCurrent(&cr_server.StateTracker)->framebufferobject.drawFB)
     {
         if (mode == GL_FRONT || mode == GL_FRONT_LEFT || mode == GL_FRONT_RIGHT)
@@ -1362 +1362 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchReadBuffer( GLenum mode )
 {
-    crStateReadBuffer( mode );
+    crStateReadBuffer(&cr_server.StateTracker, mode );
 
     if (crServerIsRedirectedToFBO()
             && cr_server.curClient->currentMural->aidFBOs[0]
-            && !crStateGetCurrent()->framebufferobject.readFB)
+            && !crStateGetCurrent(&cr_server.StateTracker)->framebufferobject.readFB)
     {
         CRMuralInfo *mural = cr_server.curClient->currentMural;
@@ -1433 +1433 @@
 {
     GLenum retval, err;
-    CRContext *ctx = crStateGetCurrent();
+    CRContext *ctx = crStateGetCurrent(&cr_server.StateTracker);
     retval = ctx->error;
 
@@ -1453 +1453 @@
 crServerMakeTmpCtxCurrent( GLint window, GLint nativeWindow, GLint context )
 {
-    CRContext *pCtx = crStateGetCurrent();
+    CRContext *pCtx = crStateGetCurrent(&cr_server.StateTracker);
     CRContext *pCurCtx = NULL;
     GLuint idDrawFBO = 0, idReadFBO = 0;
@@ -1890 +1890 @@
 GLvoid crServerSpriteCoordReplEnable(GLboolean fEnable)
 {
-    CRContext *g = crStateGetCurrent();
+    CRContext *g = crStateGetCurrent(&cr_server.StateTracker);
     CRTextureState *t = &(g->texture);
     GLuint curTextureUnit = t->curTextureUnit;
@@ -1948 +1948 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchEnd( void )
 {
-    CRContext *g = crStateGetCurrent();
+    CRContext *g = crStateGetCurrent(&cr_server.StateTracker);
     GLenum mode = g->current.mode;
 
-    crStateEnd();
+    crStateEnd(&cr_server.StateTracker);
     cr_server.head_spu->dispatch_table.End();
 
@@ -1963 +1963 @@
 {
 #ifdef DEBUG
-    CRContext *ctx = crStateGetCurrent();
+    CRContext *ctx = crStateGetCurrent(&cr_server.StateTracker);
     SPUDispatchTable *gl = &cr_server.head_spu->dispatch_table;
 
@@ -2012 +2012 @@
     CR_SERVER_DUMP_DRAW_ENTER();
 
-    crStateBegin(mode);
+    crStateBegin(&cr_server.StateTracker, mode);
     cr_server.head_spu->dispatch_table.Begin(mode);
 }