Changeset 35912 in vbox

Timestamp:

Feb 9, 2011 12:31:28 PM (14 years ago)

Author:

vboxsync

Message:

crOpenGL: fix sometimes missing textures and geometry

Location:

trunk/src/VBox

Files:

• Additions/common/crOpenGL/pack/packspu_client.c (modified) (1 diff)
• GuestHost/OpenGL/state_tracker/state_client.c (modified) (9 diffs)
• GuestHost/OpenGL/state_tracker/state_texture.c (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_client.c

@@ -597 +597 @@
 void PACKSPU_APIENTRY packspu_UnlockArraysEXT()
 {
+    GET_CONTEXT(ctx);
+    CRClientState *clientState = &(ctx->clientState->client);
+
+    if (clientState->array.locked && clientState->array.synced)
+    {
+        crPackUnlockArraysEXT();
+    }
+
     crStateUnlockArraysEXT();
-    crPackUnlockArraysEXT();
-}
+}

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

@@ -1488 +1488 @@
     int i;
 
+    if (!c->array.locked)
+    {
+        crDebug("crStateUnlockArraysEXT ignored because arrays aren't locked");
+        return;
+    }
+
     c->array.locked = GL_FALSE;
 #ifdef IN_GUEST
@@ -1624 +1630 @@
     CRClientState *from = &(fromCtx->client);
     const CRClientState *to = &(toCtx->client);
+    GLint curClientTextureUnit = from->curClientTextureUnit;
     int i;
 
@@ -1695 +1702 @@
                         from->array.t[i].buffer != to->array.t[i].buffer) {
                     diff_api.ClientActiveTextureARB(GL_TEXTURE0_ARB + i);
+                    curClientTextureUnit = i;
                     diff_api.TexCoordPointer(to->array.t[i].size, to->array.t[i].type,
                                                                 to->array.t[i].stride, to->array.t[i].p);
@@ -1798 +1806 @@
             if (from->array.t[i].enabled != to->array.t[i].enabled) {
                 diff_api.ClientActiveTextureARB(GL_TEXTURE0_ARB + i);
+                curClientTextureUnit = i;
                 able[to->array.t[i].enabled](GL_TEXTURE_COORD_ARRAY);
                 from->array.t[i].enabled = to->array.t[i].enabled;
@@ -1825 +1834 @@
         CLEARDIRTY2(cb->enableClientState, bitID);
     }
+
+    if (to->curClientTextureUnit != curClientTextureUnit)
+    {
+        diff_api.ClientActiveTextureARB(GL_TEXTURE0_ARB + to->curClientTextureUnit);
+    }
 }
 
@@ -1834 +1848 @@
     const CRClientState *from = &(fromCtx->client);
     const CRClientState *to = &(toCtx->client);
+    GLint curClientTextureUnit = from->curClientTextureUnit;
     int i;
 
@@ -1899 +1914 @@
                         from->array.t[i].buffer != to->array.t[i].buffer) {
                     diff_api.ClientActiveTextureARB(GL_TEXTURE0_ARB + i);
+                    curClientTextureUnit = i;
                     diff_api.TexCoordPointer(to->array.t[i].size, to->array.t[i].type,
                                                                 to->array.t[i].stride, to->array.t[i].p);
@@ -1998 +2014 @@
             if (from->array.t[i].enabled != to->array.t[i].enabled) {
                 diff_api.ClientActiveTextureARB(GL_TEXTURE0_ARB + i);
+                curClientTextureUnit = i;
                 able[to->array.t[i].enabled](GL_TEXTURE_COORD_ARRAY);
                 FILLDIRTY(cb->enableClientState);
@@ -2029 +2046 @@
         }
         CLEARDIRTY2(cb->enableClientState, bitID);
+    }
+
+    if (to->curClientTextureUnit != curClientTextureUnit)
+    {
+        diff_api.ClientActiveTextureARB(GL_TEXTURE0_ARB + to->curClientTextureUnit);
     }
 

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

@@ -791 +791 @@
 
     c->curClientTextureUnit = texture - GL_TEXTURE0_ARB;
+
+    DIRTY(GetCurrentBits()->client.dirty, g->neg_bitid);
 }