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

Timestamp:

Jun 2, 2011 11:48:48 AM (14 years ago)

Author:

vboxsync

Message:

crOpenGL: fix broken rendering when running any other opengl app under gnome3

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_program.c (modified) (16 diffs)

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

@@ -2106 +2106 @@
             able[to->vpPointSize](GL_VERTEX_PROGRAM_POINT_SIZE_NV);
         }
-
-        CLEARDIRTY(b->vpEnable, nbitID);
+        DIRTY(b->vpEnable, nbitID);
     }
 
@@ -2121 +2120 @@
             able[to->fpEnabledARB](GL_FRAGMENT_PROGRAM_ARB);
         }
-        CLEARDIRTY(b->fpEnable, nbitID);
+        DIRTY(b->fpEnable, nbitID);
     }
 
@@ -2133 +2132 @@
                                                                  to->TrackMatrixTransform[i]);
                 }
-                CLEARDIRTY(b->trackMatrix[i], nbitID);
+                DIRTY(b->trackMatrix[i], nbitID);
             }
         }
@@ -2149 +2148 @@
                     diff_api.BindProgramNV(GL_VERTEX_PROGRAM_NV, toProg->id);
             }
-            CLEARDIRTY(b->vpBinding, nbitID);
+            DIRTY(b->vpBinding, nbitID);
         }
 
@@ -2156 +2155 @@
             if (CHECKDIRTY(toProg->dirtyProgram, bitID)) {
                 if (toProg->isARBprogram)
-                    diff_api.ProgramStringARB( GL_VERTEX_PROGRAM_ARB,
-                                                                         toProg->format,
-                                                                         toProg->length,
-                                                                         toProg->string );
+                    diff_api.ProgramStringARB(GL_VERTEX_PROGRAM_ARB, toProg->format, toProg->length, toProg->string);
                 else
-                    diff_api.LoadProgramNV( GL_VERTEX_PROGRAM_NV,
-                                                                    toProg->id,
-                                                                    toProg->length,
-                                                                    toProg->string );
-                CLEARDIRTY(toProg->dirtyProgram, nbitID);
+                    diff_api.LoadProgramNV(GL_VERTEX_PROGRAM_NV, toProg->id, toProg->length, toProg->string);
+
+                DIRTY(toProg->dirtyProgram, nbitID);
             }
 
@@ -2173 +2167 @@
                     if (CHECKDIRTY(b->vertexEnvParameter[i], bitID)) {
                         if (toProg->isARBprogram)
-                            diff_api.ProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB, i,
-                                                                                                 to->vertexParameters[i]);
+                            diff_api.ProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB, i, to->vertexParameters[i]);
                         else
-                            diff_api.ProgramParameter4fvNV(GL_VERTEX_PROGRAM_NV, i,
-                                                                                         to->vertexParameters[i]);
-                        CLEARDIRTY(b->vertexEnvParameter[i], nbitID);
+                            diff_api.ProgramParameter4fvNV(GL_VERTEX_PROGRAM_NV, i, to->vertexParameters[i]);
+
+                        DIRTY(b->vertexEnvParameter[i], nbitID);
                     }
                 }
-                CLEARDIRTY(b->vertexEnvParameters, nbitID);
+                DIRTY(b->vertexEnvParameters, nbitID);
             }
 
@@ -2196 +2189 @@
                     }
                 }
-                CLEARDIRTY(toProg->dirtyParams, nbitID);
+                DIRTY(toProg->dirtyParams, nbitID);
             }
         }
@@ -2212 +2205 @@
                 diff_api.BindProgramNV(GL_FRAGMENT_PROGRAM_NV, toProg->id);
             }
-            CLEARDIRTY(b->fpBinding, nbitID);
+            DIRTY(b->fpBinding, nbitID);
         }
 
@@ -2218 +2211 @@
             /* fragment program text */
             if (CHECKDIRTY(toProg->dirtyProgram, bitID)) {
-                diff_api.LoadProgramNV( GL_FRAGMENT_PROGRAM_NV, toProg->id,
-                                                                toProg->length, toProg->string );
-                CLEARDIRTY(toProg->dirtyProgram, nbitID);
+                diff_api.LoadProgramNV(GL_FRAGMENT_PROGRAM_NV, toProg->id, toProg->length, toProg->string);
+                DIRTY(toProg->dirtyProgram, nbitID);
             }
 
@@ -2229 +2221 @@
                         diff_api.ProgramParameter4fvNV(GL_FRAGMENT_PROGRAM_NV, i,
                                                        to->fragmentParameters[i]);
-                        CLEARDIRTY(b->fragmentEnvParameter[i], nbitID);
+                        DIRTY(b->fragmentEnvParameter[i], nbitID);
                     }
                 }
-                CLEARDIRTY(b->fragmentEnvParameters, nbitID);
+                DIRTY(b->fragmentEnvParameters, nbitID);
             }
 
@@ -2244 +2236 @@
                                                             (const GLubyte *) symbol->name,
                                                             symbol->value);
-                        CLEARDIRTY(symbol->dirty, nbitID);
+                        DIRTY(symbol->dirty, nbitID);
                     }
                 }
-                CLEARDIRTY(toProg->dirtyNamedParams, nbitID);
+                DIRTY(toProg->dirtyNamedParams, nbitID);
             }
 
@@ -2255 +2247 @@
                     if (CHECKDIRTY(toProg->dirtyParam[i], bitID)) {
                         if (toProg->isARBprogram)
-                            diff_api.ProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, i,
-                                                                                                     toProg->parameters[i]);
+                            diff_api.ProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, i, toProg->parameters[i]);
                         else
-                            diff_api.ProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_NV, i,
-                                                                                                     toProg->parameters[i]);
+                            diff_api.ProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_NV, i, toProg->parameters[i]);
                     }
                 }
-                CLEARDIRTY(toProg->dirtyParams, nbitID);
+                DIRTY(toProg->dirtyParams, nbitID);
             }
         }
@@ -2274 +2264 @@
                 diff_api.BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, toProg->id);
             }
-            CLEARDIRTY(b->fpBinding, nbitID);
+            DIRTY(b->fpBinding, nbitID);
         }
 
@@ -2280 +2270 @@
             /* fragment program text */
             if (CHECKDIRTY(toProg->dirtyProgram, bitID)) {
-                diff_api.ProgramStringARB( GL_FRAGMENT_PROGRAM_ARB, toProg->format,
-                                                                         toProg->length, toProg->string );
-                CLEARDIRTY(toProg->dirtyProgram, nbitID);
+                diff_api.ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, toProg->format, toProg->length, toProg->string);
+                DIRTY(toProg->dirtyProgram, nbitID);
             }
 
@@ -2289 +2278 @@
                 for (i = 0; i < toCtx->limits.maxFragmentProgramEnvParams; i++) {
                     if (CHECKDIRTY(b->fragmentEnvParameter[i], bitID)) {
-                        diff_api.ProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, i,
-                                                                                             to->fragmentParameters[i]);
-                        CLEARDIRTY(b->fragmentEnvParameter[i], nbitID);
+                        diff_api.ProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, i, to->fragmentParameters[i]);
+                        DIRTY(b->fragmentEnvParameter[i], nbitID);
                     }
                 }
-                CLEARDIRTY(b->fragmentEnvParameters, nbitID);
+                DIRTY(b->fragmentEnvParameters, nbitID);
             }
 
@@ -2301 +2289 @@
                 for (i = 0; i < CR_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMS; i++) {
                     if (CHECKDIRTY(toProg->dirtyParam[i], bitID)) {
-                        diff_api.ProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, i,
-                                                                                                 toProg->parameters[i]);
-                        CLEARDIRTY(toProg->dirtyParam[i], nbitID);
+                        diff_api.ProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, i, toProg->parameters[i]);
+                        DIRTY(toProg->dirtyParam[i], nbitID);
                     }
                 }
-                CLEARDIRTY(toProg->dirtyParams, nbitID);
-            }
-        }
-    }
-
-    CLEARDIRTY(b->dirty, nbitID);
+                DIRTY(toProg->dirtyParams, nbitID);
+            }
+        }
+    }
+
+    DIRTY(b->dirty, nbitID);
 
     /* Resend program data */