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

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

130368

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_muralfbo.cpp (modified) (6 diffs)

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

@@ -477 +477 @@
         if (cr_server.curClient && cr_server.curClient->currentMural == mural)
         {
-            if (!crStateGetCurrent()->framebufferobject.drawFB)
+            CRContext *ctx = crStateGetCurrent(&cr_server.StateTracker);
+
+            if (!ctx->framebufferobject.drawFB)
             {
                 cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, CR_SERVER_FBO_FOR_IDX(mural, mural->iCurDrawBuffer));
             }
-            if (!crStateGetCurrent()->framebufferobject.readFB)
+            if (!ctx->framebufferobject.readFB)
             {
                 cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_READ_FRAMEBUFFER, CR_SERVER_FBO_FOR_IDX(mural, mural->iCurReadBuffer));
             }
 
-            crStateGetCurrent()->buffer.width = 0;
-            crStateGetCurrent()->buffer.height = 0;
+            ctx->buffer.width = 0;
+            ctx->buffer.height = 0;
         }
     }
@@ -494 +496 @@
         if (cr_server.curClient && cr_server.curClient->currentMural == mural)
         {
-            if (!crStateGetCurrent()->framebufferobject.drawFB)
+            CRContext *ctx = crStateGetCurrent(&cr_server.StateTracker);
+
+            if (!ctx->framebufferobject.drawFB)
             {
                 cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, 0);
             }
-            if (!crStateGetCurrent()->framebufferobject.readFB)
+            if (!ctx->framebufferobject.readFB)
             {
                 cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_READ_FRAMEBUFFER, 0);
             }
 
-            crStateGetCurrent()->buffer.width = mural->width;
-            crStateGetCurrent()->buffer.height = mural->height;
+            ctx->buffer.width = mural->width;
+            ctx->buffer.height = mural->height;
         }
     }
@@ -513 +517 @@
 static void crServerCreateMuralFBO(CRMuralInfo *mural)
 {
-    CRContext *ctx = crStateGetCurrent();
+    CRContext *ctx = crStateGetCurrent(&cr_server.StateTracker);
     GLuint uid, i;
     GLenum status;
@@ -540 +544 @@
     /*Color texture*/
 
-    if (crStateIsBufferBound(GL_PIXEL_UNPACK_BUFFER_ARB))
+    if (crStateIsBufferBound(&cr_server.StateTracker, GL_PIXEL_UNPACK_BUFFER_ARB))
     {
         gl->BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
@@ -605 +609 @@
     gl->BindFramebufferEXT(GL_READ_FRAMEBUFFER, uid);
 
-    if (crStateIsBufferBound(GL_PIXEL_UNPACK_BUFFER_ARB))
+    if (crStateIsBufferBound(&cr_server.StateTracker, GL_PIXEL_UNPACK_BUFFER_ARB))
     {
         gl->BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, ctx->bufferobject.unpackBuffer->hwid);
     }
 
-    if (crStateIsBufferBound(GL_PIXEL_PACK_BUFFER_ARB))
+    if (crStateIsBufferBound(&cr_server.StateTracker, GL_PIXEL_PACK_BUFFER_ARB))
     {
         gl->BindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, ctx->bufferobject.packBuffer->hwid);
@@ -825 +829 @@
 void crServerMuralFBOSwapBuffers(CRMuralInfo *mural)
 {
-    CRContext *ctx = crStateGetCurrent();
+    CRContext *ctx = crStateGetCurrent(&cr_server.StateTracker);
     GLint iOldCurDrawBuffer = mural->iCurDrawBuffer;
     GLint iOldCurReadBuffer = mural->iCurReadBuffer;