Changeset 78375 in vbox for trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_fog.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/GuestHost/OpenGL/state_tracker/state_fog.c (modified) (11 diffs)

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_fog.c

@@ -13 +13 @@
 {
         CRFogState *f = &ctx->fog;
-        CRStateBits *sb = GetCurrentBits();
+        CRStateBits *sb = GetCurrentBits(ctx->pStateTracker);
         CRFogBits *fb = &(sb->fog);
         GLcolorf black = {0.0f, 0.0f, 0.0f, 0.0f};
@@ -43 +43 @@
 }
 
-void STATE_APIENTRY crStateFogf(GLenum pname, GLfloat param) 
+void STATE_APIENTRY crStateFogf(PCRStateTracker pState, GLenum pname, GLfloat param) 
 {
-        crStateFogfv( pname, &param );
+        crStateFogfv(pState, pname, &param );
 }
 
-void STATE_APIENTRY crStateFogi(GLenum pname, GLint param) 
+void STATE_APIENTRY crStateFogi(PCRStateTracker pState, GLenum pname, GLint param) 
 {
         GLfloat f_param = (GLfloat) param;
-        crStateFogfv( pname, &f_param );
+        crStateFogfv(pState, pname, &f_param );
 }
 
-void STATE_APIENTRY crStateFogiv(GLenum pname, const GLint *param) 
+void STATE_APIENTRY crStateFogiv(PCRStateTracker pState, GLenum pname, const GLint *param) 
 {
         GLcolor f_color;
@@ -66 +66 @@
                 case GL_FOG_INDEX:
                         f_param = (GLfloat) (*param);
-                        crStateFogfv( pname, &f_param );
+                        crStateFogfv(pState, pname, &f_param );
                         break;
                 case GL_FOG_COLOR:
@@ -73 +73 @@
                         f_color.b = ((GLfloat) param[2]) / ((GLfloat) CR_MAXINT);
                         f_color.a = ((GLfloat) param[3]) / ((GLfloat) CR_MAXINT);
-                        crStateFogfv( pname, (GLfloat *) &f_color );
+                        crStateFogfv(pState, pname, (GLfloat *) &f_color );
                         break;
 #ifdef CR_NV_fog_distance
                 case GL_FOG_DISTANCE_MODE_NV:
                         f_param = (GLfloat) (*param);
-                        crStateFogfv( pname, &f_param );
+                        crStateFogfv(pState, pname, &f_param );
                         break;
 #endif
@@ -84 +84 @@
                 case GL_FOG_COORDINATE_SOURCE_EXT:
                         f_param = (GLfloat) (*param);
-                        crStateFogfv( pname, &f_param );
+                        crStateFogfv(pState, pname, &f_param );
                         break;
 #endif
                 default:
-                        crStateError(__LINE__, __FILE__, GL_INVALID_VALUE, "Invalid glFog Param: %d", param);
+                        crStateError(pState, __LINE__, __FILE__, GL_INVALID_VALUE, "Invalid glFog Param: %d", param);
                         return;
         }
 }
 
-void STATE_APIENTRY crStateFogfv(GLenum pname, const GLfloat *param) 
+void STATE_APIENTRY crStateFogfv(PCRStateTracker pState, GLenum pname, const GLfloat *param) 
 {
-        CRContext *g = GetCurrentContext();
+        CRContext *g = GetCurrentContext(pState);
         CRFogState *f = &(g->fog);
-        CRStateBits *sb = GetCurrentBits();
+        CRStateBits *sb = GetCurrentBits(pState);
         CRFogBits *fb = &(sb->fog);
 
         if (g->current.inBeginEnd)
         {
-                crStateError(__LINE__, __FILE__, GL_INVALID_OPERATION, "glFogfv called in Begin/End");
+                crStateError(pState, __LINE__, __FILE__, GL_INVALID_OPERATION, "glFogfv called in Begin/End");
                 return;
         }
@@ -115 +115 @@
                                 if (e != GL_LINEAR && e != GL_EXP && e != GL_EXP2)
                                 {
-                                        crStateError(__LINE__, __FILE__, GL_INVALID_ENUM, "Invalid param for glFog: %d", e);
+                                        crStateError(pState, __LINE__, __FILE__, GL_INVALID_ENUM, "Invalid param for glFog: %d", e);
                                         return;
                                 }
@@ -157 +157 @@
                                         param[0] != GL_EYE_PLANE_ABSOLUTE_NV )
                                 {
-                                        crStateError(__LINE__, __FILE__, GL_INVALID_ENUM,
+                                        crStateError(pState, __LINE__, __FILE__, GL_INVALID_ENUM,
                                                 "Fogfv: GL_FOG_DISTANCE_MODE_NV called with illegal parameter: 0x%x", (GLenum) param[0]);
                                         return;
@@ -166 +166 @@
                         else
                         {
-                                crStateError(__LINE__, __FILE__, GL_INVALID_VALUE, "Invalid glFog Param: %d", param);
+                                crStateError(pState, __LINE__, __FILE__, GL_INVALID_VALUE, "Invalid glFog Param: %d", param);
                                 return;
                         }
@@ -178 +178 @@
                                                 (GLenum) param[0] != GL_FRAGMENT_DEPTH_EXT)
                                 {
-                                        crStateError(__LINE__, __FILE__, GL_INVALID_ENUM,
+                                        crStateError(pState, __LINE__, __FILE__, GL_INVALID_ENUM,
                                                 "Fogfv: GL_FOG_COORDINATE_SOURCE_EXT called with illegal parameter: 0x%x", (GLenum) param[0]);
                                         return;
@@ -187 +187 @@
                         else
                         {
-                                crStateError(__LINE__, __FILE__, GL_INVALID_VALUE, "Invalid glFog Param: 0x%x", (GLint) param[0]);
+                                crStateError(pState, __LINE__, __FILE__, GL_INVALID_VALUE, "Invalid glFog Param: 0x%x", (GLint) param[0]);
                                 return;
                         }
@@ -193 +193 @@
 #endif
                 default:
-                        crStateError(__LINE__, __FILE__, GL_INVALID_VALUE, "Invalid glFog Param: %d", param);
+                        crStateError(pState, __LINE__, __FILE__, GL_INVALID_VALUE, "Invalid glFog Param: %d", param);
                         return;
         }