Changeset 78375 in vbox for trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_misc.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_misc.c (modified) (13 diffs)

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

@@ -98 +98 @@
     GLint buffer;
 
-    crStateGetIntegerv(GL_DRAW_BUFFER, &buffer);
+    crStateGetIntegerv(&pack_spu.StateTracker, GL_DRAW_BUFFER, &buffer);
     /*Usually buffer==GL_BACK, so put this extra check to simplify boolean eval on runtime*/
     return  (buffer != GL_BACK)
@@ -116 +116 @@
     hadtoflush = packspuSyncOnFlushes();
 
-    crStateDrawBuffer(mode);
+    crStateDrawBuffer(&pack_spu.StateTracker, mode);
     crPackDrawBuffer(mode);
 
@@ -197 +197 @@
 void PACKSPU_APIENTRY packspu_NewList(GLuint list, GLenum mode)
 {
-    crStateNewList(list, mode);
+    crStateNewList(&pack_spu.StateTracker, list, mode);
     crPackNewList(list, mode);
 }
@@ -203 +203 @@
 void PACKSPU_APIENTRY packspu_EndList()
 {
-    crStateEndList();
+    crStateEndList(&pack_spu.StateTracker);
     crPackEndList();
 }
@@ -366 +366 @@
     crPackGetPolygonStipple( mask, &writeback );
 #ifdef CR_ARB_pixel_buffer_object
-    if (!crStateIsBufferBound(GL_PIXEL_PACK_BUFFER_ARB))
+    if (!crStateIsBufferBound(&pack_spu.StateTracker, GL_PIXEL_PACK_BUFFER_ARB))
 #endif
     {
@@ -381 +381 @@
     crPackGetPixelMapfv( map, values, &writeback );
 #ifdef CR_ARB_pixel_buffer_object
-    if (!crStateIsBufferBound(GL_PIXEL_PACK_BUFFER_ARB))
+    if (!crStateIsBufferBound(&pack_spu.StateTracker, GL_PIXEL_PACK_BUFFER_ARB))
 #endif
     {
@@ -397 +397 @@
 
 #ifdef CR_ARB_pixel_buffer_object
-    if (!crStateIsBufferBound(GL_PIXEL_PACK_BUFFER_ARB))
+    if (!crStateIsBufferBound(&pack_spu.StateTracker, GL_PIXEL_PACK_BUFFER_ARB))
 #endif
     {
@@ -412 +412 @@
     crPackGetPixelMapusv( map, values, &writeback );
 #ifdef CR_ARB_pixel_buffer_object
-    if (!crStateIsBufferBound(GL_PIXEL_PACK_BUFFER_ARB))
+    if (!crStateIsBufferBound(&pack_spu.StateTracker, GL_PIXEL_PACK_BUFFER_ARB))
 #endif
     {
@@ -449 +449 @@
             return;
         case GL_SHARE_CONTEXT_RESOURCES_CR:
-            crStateShareContext(value);
+            crStateShareContext(&pack_spu.StateTracker, value);
             break;
         case GL_RCUSAGE_TEXTURE_SET_CR:
         {
             Assert(value);
-            crStateSetTextureUsed(value, GL_TRUE);
+            crStateSetTextureUsed(&pack_spu.StateTracker, value, GL_TRUE);
             break;
         }
@@ -462 +462 @@
 #ifdef DEBUG
             {
-                CRContext *pCurState = crStateGetCurrent();
+                CRContext *pCurState = crStateGetCurrent(&pack_spu.StateTracker);
                 CRTextureObj *tobj = (CRTextureObj*)crHashtableSearch(pCurState->shared->textureTable, value);
                 Assert(tobj);
             }
 #endif
-            crStateSetTextureUsed(value, GL_FALSE);
+            crStateSetTextureUsed(&pack_spu.StateTracker, value, GL_FALSE);
             break;
         }
@@ -481 +481 @@
     int writeback = 1;
     GLenum return_val = (GLenum) 0;
-    CRContext *pCurState = crStateGetCurrent();
+    CRContext *pCurState = crStateGetCurrent(&pack_spu.StateTracker);
     NOREF(pCurState); /* it's unused, but I don't know about side effects.. */
 
@@ -620 +620 @@
     crSetTSD(&_PackTSD, NULL);
 
-    crStateVBoxAttachThread();
+    crStateVBoxAttachThread(&pack_spu.StateTracker);
 }
 
@@ -701 +701 @@
     }
 
-    crStateVBoxDetachThread();
+    crStateVBoxDetachThread(&pack_spu.StateTracker);
 }