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

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

@@ -25 +25 @@
 packspu_FramebufferTexture1DEXT(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    crStateFramebufferTexture1DEXT(target, attachment, textarget, texture, level);
+    crStateFramebufferTexture1DEXT(&pack_spu.StateTracker, target, attachment, textarget, texture, level);
     crPackFramebufferTexture1DEXT(target, attachment, textarget, texture, level);
 }
@@ -32 +32 @@
 packspu_FramebufferTexture2DEXT(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    crStateFramebufferTexture2DEXT(target, attachment, textarget, texture, level);
+    crStateFramebufferTexture2DEXT(&pack_spu.StateTracker, target, attachment, textarget, texture, level);
     crPackFramebufferTexture2DEXT(target, attachment, textarget, texture, level);
 }
@@ -39 +39 @@
 packspu_FramebufferTexture3DEXT(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    crStateFramebufferTexture3DEXT(target, attachment, textarget, texture, level, zoffset);
+    crStateFramebufferTexture3DEXT(&pack_spu.StateTracker, target, attachment, textarget, texture, level, zoffset);
     crPackFramebufferTexture3DEXT(target, attachment, textarget, texture, level, zoffset);
 }
@@ -46 +46 @@
 packspu_BindFramebufferEXT(GLenum target, GLuint framebuffer)
 {
-        crStateBindFramebufferEXT(target, framebuffer);
+    crStateBindFramebufferEXT(&pack_spu.StateTracker, target, framebuffer);
     crPackBindFramebufferEXT(target, framebuffer);
 }
@@ -53 +53 @@
 packspu_DeleteFramebuffersEXT(GLsizei n, const GLuint * framebuffers)
 {
-        crStateDeleteFramebuffersEXT(n, framebuffers);
+    crStateDeleteFramebuffersEXT(&pack_spu.StateTracker, n, framebuffers);
     crPackDeleteFramebuffersEXT(n, framebuffers);
 }
@@ -60 +60 @@
 packspu_DeleteRenderbuffersEXT(GLsizei n, const GLuint * renderbuffers)
 {
-        crStateDeleteRenderbuffersEXT(n, renderbuffers);
+    crStateDeleteRenderbuffersEXT(&pack_spu.StateTracker, n, renderbuffers);
     crPackDeleteRenderbuffersEXT(n, renderbuffers);
 }
@@ -67 +67 @@
 packspu_FramebufferRenderbufferEXT(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-        crStateFramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer);
+    crStateFramebufferRenderbufferEXT(&pack_spu.StateTracker, target, attachment, renderbuffertarget, renderbuffer);
     crPackFramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer);
 }
@@ -74 +74 @@
 packspu_BindRenderbufferEXT(GLenum target, GLuint renderbuffer)
 {
-    crStateBindRenderbufferEXT(target, renderbuffer);
+    crStateBindRenderbufferEXT(&pack_spu.StateTracker, target, renderbuffer);
     crPackBindRenderbufferEXT(target, renderbuffer);
 }
@@ -81 +81 @@
 packspu_CheckFramebufferStatusEXT(GLenum target)
 {
-        GET_THREAD(thread);
-        int writeback = 1;
-    GLenum status = crStateCheckFramebufferStatusEXT(target);
+    GET_THREAD(thread);
+    int writeback = 1;
+    GLenum status = crStateCheckFramebufferStatusEXT(&pack_spu.StateTracker, target);
 
     if (status!=GL_FRAMEBUFFER_UNDEFINED)
@@ -92 +92 @@
     crPackCheckFramebufferStatusEXT(target, &status, &writeback);
 
-        packspuFlush((void *) thread);
+    packspuFlush((void *) thread);
     CRPACKSPU_WRITEBACK_WAIT(thread, writeback);
 
-    crStateSetFramebufferStatus(target, status);
+    crStateSetFramebufferStatus(&pack_spu.StateTracker, target, status);
     return status;
 }
@@ -112 +112 @@
     CRPACKSPU_WRITEBACK_WAIT(thread, writeback);
 
-    crStateRegFramebuffers(n, framebuffers);
+    crStateRegFramebuffers(&pack_spu.StateTracker, n, framebuffers);
 }
 
@@ -128 +128 @@
     CRPACKSPU_WRITEBACK_WAIT(thread, writeback);
 
-    crStateRegRenderbuffers(n, renderbuffers);
+    crStateRegRenderbuffers(&pack_spu.StateTracker, n, renderbuffers);
 }