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

Timestamp:

Aug 9, 2010 2:00:01 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

64570

Message:

crOpenGL: partial merge of state_client.c patch submitted to vboxdev

Location:

trunk/src/VBox/GuestHost/OpenGL/state_tracker

Files:

• state_client.c (modified) (13 diffs)
• state_error.c (modified) (1 diff)

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

@@ -1851 +1851 @@
                 FILLDIRTY(cb->v);
                 FILLDIRTY(cb->clientPointer);
+                FILLDIRTY(cb->dirty);
             }
             CLEARDIRTY2(cb->v, bitID);
@@ -1863 +1864 @@
                 FILLDIRTY(cb->n);
                 FILLDIRTY(cb->clientPointer);
+                FILLDIRTY(cb->dirty);
             }
             CLEARDIRTY2(cb->n, bitID);
@@ -1876 +1878 @@
                 FILLDIRTY(cb->c);
                 FILLDIRTY(cb->clientPointer);
+                FILLDIRTY(cb->dirty);
             }
             CLEARDIRTY2(cb->c, bitID);
@@ -1887 +1890 @@
                                                             to->array.i.stride, to->array.i.p);
                 FILLDIRTY(cb->i);
+                FILLDIRTY(cb->dirty);
                 FILLDIRTY(cb->clientPointer);
             }
@@ -1903 +1907 @@
                     FILLDIRTY(cb->t[i]);
                     FILLDIRTY(cb->clientPointer);
+                    FILLDIRTY(cb->dirty);
                 }
                 CLEARDIRTY2(cb->t[i], bitID);
@@ -1914 +1919 @@
                 FILLDIRTY(cb->e);
                 FILLDIRTY(cb->clientPointer);
+                FILLDIRTY(cb->dirty);
             }
             CLEARDIRTY2(cb->e, bitID);
@@ -1927 +1933 @@
                 FILLDIRTY(cb->s);
                 FILLDIRTY(cb->clientPointer);
+                FILLDIRTY(cb->dirty);
             }
             CLEARDIRTY2(cb->s, bitID);
@@ -1939 +1946 @@
                 FILLDIRTY(cb->f);
                 FILLDIRTY(cb->clientPointer);
+                FILLDIRTY(cb->dirty);
             }
             CLEARDIRTY2(cb->f, bitID);
@@ -1958 +1966 @@
                     FILLDIRTY(cb->a[i]);
                     FILLDIRTY(cb->clientPointer);
+                    FILLDIRTY(cb->dirty);
                 }
                 CLEARDIRTY2(cb->a[i], bitID);
@@ -1973 +1982 @@
             able[to->array.v.enabled](GL_VERTEX_ARRAY);
             FILLDIRTY(cb->enableClientState);
+            FILLDIRTY(cb->dirty);
         }
         if (from->array.n.enabled != to->array.n.enabled) {
             able[to->array.n.enabled](GL_NORMAL_ARRAY);
             FILLDIRTY(cb->enableClientState);
+            FILLDIRTY(cb->dirty);
         }
         if (from->array.c.enabled != to->array.c.enabled) {
             able[to->array.c.enabled](GL_COLOR_ARRAY);
             FILLDIRTY(cb->enableClientState);
+            FILLDIRTY(cb->dirty);
         }
         if (from->array.i.enabled != to->array.i.enabled) {
             able[to->array.i.enabled](GL_INDEX_ARRAY);
             FILLDIRTY(cb->enableClientState);
+            FILLDIRTY(cb->dirty);
         }
         for (i = 0; (unsigned int)i < toCtx->limits.maxTextureUnits; i++) {
@@ -1991 +2004 @@
                 able[to->array.t[i].enabled](GL_TEXTURE_COORD_ARRAY);
                 FILLDIRTY(cb->enableClientState);
+                FILLDIRTY(cb->dirty);
             }
         }
@@ -1996 +2010 @@
             able[to->array.e.enabled](GL_EDGE_FLAG_ARRAY);
             FILLDIRTY(cb->enableClientState);
+            FILLDIRTY(cb->dirty);
         }
         if (from->array.s.enabled != to->array.s.enabled) {
             able[to->array.s.enabled](GL_SECONDARY_COLOR_ARRAY_EXT);
             FILLDIRTY(cb->enableClientState);
+            FILLDIRTY(cb->dirty);
         }
         if (from->array.f.enabled != to->array.f.enabled) {
             able[to->array.f.enabled](GL_FOG_COORDINATE_ARRAY_EXT);
             FILLDIRTY(cb->enableClientState);
+            FILLDIRTY(cb->dirty);
         }
         for (i = 0; (unsigned int)i < toCtx->limits.maxVertexProgramAttribs; i++) {
@@ -2012 +2029 @@
                     diff_api.DisableVertexAttribArrayARB(i);
                 FILLDIRTY(cb->enableClientState);
+                FILLDIRTY(cb->dirty);
             }
         }
         CLEARDIRTY2(cb->enableClientState, bitID);
     }
+
+    CLEARDIRTY2(cb->dirty, bitID);
 }
 

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

@@ -21 +21 @@
         g->error = error;
 
-        if (crGetenv("CR_DEBUG"))
+        if (1||crGetenv("CR_DEBUG"))
         {
                 char *glerr;