Changeset 78375 in vbox for trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_get.py

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/GuestHost/OpenGL/state_tracker/state_get.py (modified) (6 diffs)

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_get.py

@@ -146 +146 @@
 header = """
 {
-        CRContext *g = GetCurrentContext();
+        CRContext *g = GetCurrentContext(pState);
 
         if (g->current.inBeginEnd)
         {
-                crStateError(__LINE__, __FILE__, GL_INVALID_OPERATION,
+                crStateError(pState, __LINE__, __FILE__, GL_INVALID_OPERATION,
                         "glGet called in Begin/End");
                 return;
@@ -162 +162 @@
         {
 #if 0
-                crStateError(__LINE__,__FILE__, GL_INVALID_OPERATION,
+                crStateError(pState, __LINE__,__FILE__, GL_INVALID_OPERATION,
                         "Unimplemented glGet of a 'current' value" );
 #else
-                crStateCurrentRecover();/* &g->current, &sb->current, g->bitID );*/
+                crStateCurrentRecover(pState);/* &g->current, &sb->current, g->bitID );*/
                 
 #endif
@@ -175 +175 @@
 for rettype in types:
         print('')
-        print('void STATE_APIENTRY crStateGet%sv( GLenum pname, %s *params )' % ( rettype, ctypes[rettype] ))
+        print('void STATE_APIENTRY crStateGet%sv(PCRStateTracker pState, GLenum pname, %s *params )' % ( rettype, ctypes[rettype] ))
         print(header)
 
@@ -189 +189 @@
                                 i += 1
                 except:
-                        print('\t\t\tcrStateError(__LINE__,__FILE__,GL_INVALID_OPERATION, "Unimplemented glGet!");')
+                        print('\t\t\tcrStateError(pState, __LINE__,__FILE__,GL_INVALID_OPERATION, "Unimplemented glGet!");')
                 print("\t\t\tbreak;")
 
@@ -216 +216 @@
                                 i += 1
                 except:
-                        print('\t\t\tcrStateError(__LINE__,__FILE__,GL_INVALID_OPERATION, "Unimplemented glGet!");')
+                        print('\t\t\tcrStateError(pState, __LINE__,__FILE__,GL_INVALID_OPERATION, "Unimplemented glGet!");')
                 if ext != 'OPENGL_VERSION_1_2':
                         print("\t\t\t}")
                         print("\t\t\telse {")
-                        print('\t\t\t\tcrStateError(__LINE__,__FILE__,GL_INVALID_ENUM, "glGet%sv");' % rettype)
+                        print('\t\t\t\tcrStateError(pState, __LINE__,__FILE__,GL_INVALID_ENUM, "glGet%sv");' % rettype)
                         print("\t\t\t}")
                 print("\t\t\tbreak;")
@@ -227 +227 @@
 
         print('\t\tdefault:')
-        print('\t\t\tcrStateError(__LINE__, __FILE__, GL_INVALID_ENUM, "glGet: Unknown enum: 0x%x", pname);')
+        print('\t\t\tcrStateError(pState, __LINE__, __FILE__, GL_INVALID_ENUM, "glGet: Unknown enum: 0x%x", pname);')
         print('\t\t\treturn;')
         print('\t}')