Changeset 78375 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/unpacker

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

Location:

trunk/src/VBox/HostServices/SharedOpenGL/unpacker

Files:

• unpack_arrays.cpp (modified) (3 diffs)
• unpack_drawpixels.cpp (modified) (2 diffs)
• unpack_misc.cpp (modified) (1 diff)
• unpack_pixelmap.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_arrays.cpp

@@ -8 +8 @@
 #include "unpack_extend.h"
 #include "unpacker.h"
-#include "cr_glstate.h"
 
 
@@ -292 +291 @@
     int numenabled = READ_DATA(pState, sizeof(int) + 12, int);
 
-    CRContext *g = crStateGetCurrent();
+    CRContext *g = crStateGetCurrent(pState->pStateTracker);
     CRClientState *c = &g->client;
     CRClientPointer *cp;
@@ -364 +363 @@
 {
     int i;
-    CRContext *g = crStateGetCurrent();
+    CRContext *g = crStateGetCurrent(pState->pStateTracker);
     CRClientState *c = &g->client;
     CRClientPointer *cp;

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_drawpixels.cpp

@@ -22 +22 @@
     GLvoid *pixels;
 
-    if (noimagedata && !crStateIsBufferBound(GL_PIXEL_UNPACK_BUFFER_ARB))
+    if (noimagedata && !crStateIsBufferBound(pState->pStateTracker, GL_PIXEL_UNPACK_BUFFER_ARB))
         return;
 
@@ -63 +63 @@
     GLubyte *bitmap;
 
-    if (noimagedata && !crStateIsBufferBound(GL_PIXEL_UNPACK_BUFFER_ARB))
+    if (noimagedata && !crStateIsBufferBound(pState->pStateTracker, GL_PIXEL_UNPACK_BUFFER_ARB))
         return;
 

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_misc.cpp

@@ -54 +54 @@
     const GLuint *ids = DATA_POINTER(pState, 12, GLuint);
 
-    if (n <= 0 || n >= INT32_MAX / sizeof(GLint) / 4 || !DATA_POINTER_CHECK(pState, 12 + n * sizeof(GLuint)))
+    if (n < 0 || n >= INT32_MAX / sizeof(GLint) / 4 || !DATA_POINTER_CHECK(pState, 12 + n * sizeof(GLuint)))
     {
         crError("crUnpackExtendDeleteQueriesARB: parameter 'n' is out of range");

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_pixelmap.cpp

@@ -17 +17 @@
     GLfloat *values;
 
-    if (nodata && !crStateIsBufferBound(GL_PIXEL_UNPACK_BUFFER_ARB))
+    if (nodata && !crStateIsBufferBound(pState->pStateTracker, GL_PIXEL_UNPACK_BUFFER_ARB))
         return;
 
@@ -47 +47 @@
     GLuint *values;
 
-    if (nodata && !crStateIsBufferBound(GL_PIXEL_UNPACK_BUFFER_ARB))
+    if (nodata && !crStateIsBufferBound(pState->pStateTracker, GL_PIXEL_UNPACK_BUFFER_ARB))
         return;
 
@@ -77 +77 @@
     GLushort *values;
 
-    if (nodata && !crStateIsBufferBound(GL_PIXEL_UNPACK_BUFFER_ARB))
+    if (nodata && !crStateIsBufferBound(pState->pStateTracker, GL_PIXEL_UNPACK_BUFFER_ARB))
         return;