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

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

@@ -32 +32 @@
     GLenum err = cr_server.head_spu->dispatch_table.GetError();
 #endif
-    cr_server.head_spu->dispatch_table.ShaderSource(crStateGetShaderHWID(shader), count, string, length);
+    cr_server.head_spu->dispatch_table.ShaderSource(crStateGetShaderHWID(&cr_server.StateTracker, shader), count, string, length);
 #ifdef DEBUG_misha
     err = cr_server.head_spu->dispatch_table.GetError();
@@ -45 +45 @@
     GLint iCompileStatus = GL_FALSE;
 #endif
-    crStateCompileShader(shader);
-    cr_server.head_spu->dispatch_table.CompileShader(crStateGetShaderHWID(shader));
-#ifdef DEBUG_misha
-    cr_server.head_spu->dispatch_table.GetShaderiv(crStateGetShaderHWID(shader), GL_COMPILE_STATUS, &iCompileStatus);
+    crStateCompileShader(&cr_server.StateTracker, shader);
+    cr_server.head_spu->dispatch_table.CompileShader(crStateGetShaderHWID(&cr_server.StateTracker, shader));
+#ifdef DEBUG_misha
+    cr_server.head_spu->dispatch_table.GetShaderiv(crStateGetShaderHWID(&cr_server.StateTracker, shader), GL_COMPILE_STATUS, &iCompileStatus);
     Assert(iCompileStatus == GL_TRUE);
 #endif
@@ -56 +56 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchDeleteShader(GLuint shader)
 {
-    GLuint shaderHW = crStateGetShaderHWID(shader);
-    crStateDeleteShader(shader);
+    GLuint shaderHW = crStateGetShaderHWID(&cr_server.StateTracker, shader);
+    crStateDeleteShader(&cr_server.StateTracker, shader);
     if (shaderHW)
         cr_server.head_spu->dispatch_table.DeleteShader(shaderHW);
@@ -66 +66 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchAttachShader(GLuint program, GLuint shader)
 {
-    crStateAttachShader(program, shader);
-    cr_server.head_spu->dispatch_table.AttachShader(crStateGetProgramHWID(program), crStateGetShaderHWID(shader));
+    crStateAttachShader(&cr_server.StateTracker, program, shader);
+    cr_server.head_spu->dispatch_table.AttachShader(crStateGetProgramHWID(&cr_server.StateTracker, program),
+                                                    crStateGetShaderHWID(&cr_server.StateTracker, shader));
 }
 
 void SERVER_DISPATCH_APIENTRY crServerDispatchDetachShader(GLuint program, GLuint shader)
 {
-    crStateDetachShader(program, shader);
-    cr_server.head_spu->dispatch_table.DetachShader(crStateGetProgramHWID(program), crStateGetShaderHWID(shader));
+    crStateDetachShader(&cr_server.StateTracker, program, shader);
+    cr_server.head_spu->dispatch_table.DetachShader(crStateGetProgramHWID(&cr_server.StateTracker, program),
+                                                    crStateGetShaderHWID(&cr_server.StateTracker, shader));
 }
 
 void SERVER_DISPATCH_APIENTRY crServerDispatchLinkProgram(GLuint program)
 {
-    crStateLinkProgram(program);
-    cr_server.head_spu->dispatch_table.LinkProgram(crStateGetProgramHWID(program));
+    crStateLinkProgram(&cr_server.StateTracker, program);
+    cr_server.head_spu->dispatch_table.LinkProgram(crStateGetProgramHWID(&cr_server.StateTracker, program));
     CR_SERVER_DUMP_LINK_PROGRAM(program);
 }
@@ -85 +87 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchUseProgram(GLuint program)
 {
-    crStateUseProgram(program);
-    cr_server.head_spu->dispatch_table.UseProgram(crStateGetProgramHWID(program));
+    crStateUseProgram(&cr_server.StateTracker, program);
+    cr_server.head_spu->dispatch_table.UseProgram(crStateGetProgramHWID(&cr_server.StateTracker, program));
 }
 
 void SERVER_DISPATCH_APIENTRY crServerDispatchDeleteProgram(GLuint program)
 {
-    GLuint hwId = crStateGetProgramHWID(program);
-    crStateDeleteProgram(program);
+    GLuint hwId = crStateGetProgramHWID(&cr_server.StateTracker, program);
+    crStateDeleteProgram(&cr_server.StateTracker, program);
     if (hwId)
         cr_server.head_spu->dispatch_table.DeleteProgram(hwId);
@@ -101 +103 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchValidateProgram(GLuint program)
 {
-    crStateValidateProgram(program);
-    cr_server.head_spu->dispatch_table.ValidateProgram(crStateGetProgramHWID(program));
+    crStateValidateProgram(&cr_server.StateTracker, program);
+    cr_server.head_spu->dispatch_table.ValidateProgram(crStateGetProgramHWID(&cr_server.StateTracker, program));
 }
 
 void SERVER_DISPATCH_APIENTRY crServerDispatchBindAttribLocation(GLuint program, GLuint index, const char * name)
 {
-    crStateBindAttribLocation(program, index, name);
-    cr_server.head_spu->dispatch_table.BindAttribLocation(crStateGetProgramHWID(program), index, name);
+    crStateBindAttribLocation(&cr_server.StateTracker, program, index, name);
+    cr_server.head_spu->dispatch_table.BindAttribLocation(crStateGetProgramHWID(&cr_server.StateTracker, program), index, name);
 }
 
 void SERVER_DISPATCH_APIENTRY crServerDispatchDeleteObjectARB(VBoxGLhandleARB obj)
 {
-    GLuint hwid =  crStateDeleteObjectARB(obj);
+    GLuint hwid =  crStateDeleteObjectARB(&cr_server.StateTracker, obj);
 
     if (hwid)
@@ -124 +126 @@
 {
     GLint retval;
-    retval = cr_server.head_spu->dispatch_table.GetAttribLocation(crStateGetProgramHWID(program), name );
+    retval = cr_server.head_spu->dispatch_table.GetAttribLocation(crStateGetProgramHWID(&cr_server.StateTracker, program), name );
     crServerReturnValue( &retval, sizeof(retval) );
     return retval; /* WILL PROBABLY BE IGNORED */
@@ -135 +137 @@
     if (pname==GL_PROGRAM_OBJECT_ARB)
     {
-        retval = crStateGLSLProgramHWIDtoID(retval);
+        retval = crStateGLSLProgramHWIDtoID(&cr_server.StateTracker, retval);
     }
     crServerReturnValue( &retval, sizeof(retval) );
@@ -144 +146 @@
 {
     GLint retval;
-    retval = cr_server.head_spu->dispatch_table.GetUniformLocation(crStateGetProgramHWID(program), name);
+    retval = cr_server.head_spu->dispatch_table.GetUniformLocation(crStateGetProgramHWID(&cr_server.StateTracker, program), name);
     crServerReturnValue( &retval, sizeof(retval) );
     return retval; /* WILL PROBABLY BE IGNORED */
@@ -153 +155 @@
     GLint local_params[1] = {0};
     (void) params;
-    cr_server.head_spu->dispatch_table.GetProgramiv(crStateGetProgramHWID(program), pname, local_params);
+    cr_server.head_spu->dispatch_table.GetProgramiv(crStateGetProgramHWID(&cr_server.StateTracker, program), pname, local_params);
     crServerReturnValue( &(local_params[0]), 1*sizeof(GLint) );
 }
@@ -161 +163 @@
     GLint local_params[1] = {0};
     (void) params;
-    cr_server.head_spu->dispatch_table.GetShaderiv( crStateGetShaderHWID(shader), pname, local_params );
+    cr_server.head_spu->dispatch_table.GetShaderiv( crStateGetShaderHWID(&cr_server.StateTracker, shader), pname, local_params );
     crServerReturnValue( &(local_params[0]), 1*sizeof(GLint) );
 }
@@ -197 +199 @@
         pLocalProgs[i] = crServerTranslateProgramID(programs[i]);
     }
-    crStateDeleteProgramsARB(n, pLocalProgs);
+    crStateDeleteProgramsARB(&cr_server.StateTracker, n, pLocalProgs);
     cr_server.head_spu->dispatch_table.DeleteProgramsARB(n, pLocalProgs);
     crFree(pLocalProgs);