Changeset 44930 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Mar 6, 2013 10:29:33 AM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: fix current program on state restore

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c (modified) (2 diffs)

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

@@ -1187 +1187 @@
 DECLEXPORT(void) STATE_APIENTRY crStateGLSLSwitch(CRContext *from, CRContext *to)
 {
+    GLboolean fForceUseProgramSet = GL_FALSE;
     if (to->glsl.bResyncNeeded)
     {
@@ -1195 +1196 @@
         crHashtableWalk(to->glsl.programs, crStateGLSLCreateProgramCB, to);
 
+        /* crStateGLSLCreateProgramCB changes the current program, ensure we have the proper program re-sored */
+        fForceUseProgramSet = GL_TRUE;
+
         crHashtableWalk(to->glsl.shaders, crStateGLSLSyncShadersCB, NULL);
     }
 
-    if (to->glsl.activeProgram != from->glsl.activeProgram)
+    if (to->glsl.activeProgram != from->glsl.activeProgram || fForceUseProgramSet)
     {
         diff_api.UseProgram(to->glsl.activeProgram ? to->glsl.activeProgram->hwid : 0);