Changeset 54641 in vbox for trunk/src/VBox

Timestamp:

Mar 5, 2015 3:15:13 AM (10 years ago)

Author:

vboxsync

Message:

Corrected wrong assertion in vmsvga3dDrawPrimitives that would trigger all the time both texture units were active. Copied some more code from the windows version that invalidates surfaces references in context in vmsvga3dSurfaceDestroy.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.cpp (modified) (2 diffs)
• DevVGA-SVGA3d-ogl.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -2099 +2099 @@
             LogRelMax(16, ("vmsvgaFIFOGetCmdPayload: Invalid offNextCmd=%#x (offFifoMin=%#x offFifoMax=%#x)\n",
                            offNextCmd, offFifoMin, offFifoMax));
-            /** @todo release counter.   */
             cbAfter = offFifoMax - offCurrentCmd;
         }
@@ -2114 +2113 @@
             LogRelMax(16, ("vmsvgaFIFOGetCmdPayload: Invalid offNextCmd=%#x (offFifoMin=%#x offFifoMax=%#x)\n",
                            offNextCmd, offFifoMin, offFifoMax));
-            /** @todo release counter.   */
             cbBefore = 0;
         }

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

@@ -2591 +2591 @@
         Log(("vmsvga3dSurfaceDestroy id %x\n", sid));
 
+#if 1 /* Windows is doing this, guess it makes sense here as well... */
+        /* Check all contexts if this surface is used as a render target or active texture. */
+        for (uint32_t cid = 0; cid < pState->cContexts; cid++)
+        {
+            PVMSVGA3DCONTEXT pContext = &pState->paContext[cid];
+            if (pContext->id == cid)
+            {
+                for (uint32_t i = 0; i < RT_ELEMENTS(pContext->aSidActiveTexture); i++)
+                    if (pContext->aSidActiveTexture[i] == sid)
+                        pContext->aSidActiveTexture[i] = SVGA3D_INVALID_ID;
+                if (pContext->sidRenderTarget == sid)
+                    pContext->sidRenderTarget = SVGA3D_INVALID_ID;
+            }
+        }
+#endif
+
         /* @todo stricter checks for associated context */
         uint32_t cid = pSurface->idAssociatedContext;
@@ -5588 +5604 @@
             if (pTextureState[i].value == SVGA3D_INVALID_ID)
             {
-                Log(("SVGA3D_TS_BIND_TEXTURE: stage %d, texture surface id=%x\n", pTextureState[i].stage, pTextureState[i].value));
+                Log(("SVGA3D_TS_BIND_TEXTURE: stage %d, texture surface id=%x replacing=%x\n",
+                     pTextureState[i].stage, pTextureState[i].value, pContext->aSidActiveTexture[currentStage]));
 
                 pContext->aSidActiveTexture[currentStage] = SVGA3D_INVALID_ID;
@@ -5607 +5624 @@
                 PVMSVGA3DSURFACE pSurface = &pState->paSurface[sid];
 
-                Log(("SVGA3D_TS_BIND_TEXTURE: stage %d, texture surface id=%x (%d,%d)\n", pTextureState[i].stage, pTextureState[i].value, pSurface->pMipmapLevels[0].size.width, pSurface->pMipmapLevels[0].size.height));
+                Log(("SVGA3D_TS_BIND_TEXTURE: stage %d, texture surface id=%x (%d,%d) replacing=%x\n",
+                     pTextureState[i].stage, pTextureState[i].value, pSurface->pMipmapLevels[0].size.width,
+                     pSurface->pMipmapLevels[0].size.height, pContext->aSidActiveTexture[currentStage]));
 
                 if (pSurface->oglId.texture == OPENGL_INVALID_ID)
@@ -6735 +6754 @@
 
             glGetIntegerv(GL_ACTIVE_TEXTURE, &activeTextureUnit);
+            VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
             pState->ext.glActiveTexture(GL_TEXTURE0 + i);
+            VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
 
             glGetIntegerv(GL_TEXTURE_BINDING_2D, &activeTexture);
+            VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
             pState->ext.glActiveTexture(activeTextureUnit);
-
+            VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
+
+# if 0 /* Aren't we checking whether 'activeTexture' on texture unit 'i' matches what we expected?  This works if only one unit is active, but if both are it _will_ fail for one of them. */
             if (pContext->aSidActiveTexture[activeTextureUnit - GL_TEXTURE0] != SVGA3D_INVALID_ID)
             {
@@ -6747 +6771 @@
                 AssertMsg(pTexture->oglId.texture == (GLuint)activeTexture, ("%x vs %x unit %d - %d\n", pTexture->oglId.texture, activeTexture, i, activeTextureUnit - GL_TEXTURE0));
             }
+# else
+            PVMSVGA3DSURFACE pTexture = &pState->paSurface[pContext->aSidActiveTexture[i]];
+            AssertMsg(pTexture->id == pContext->aSidActiveTexture[i], ("%x vs %x\n", pTexture->id == pContext->aSidActiveTexture[i]));
+            AssertMsg(pTexture->oglId.texture == (GLuint)activeTexture,
+                      ("%x vs %x unit %d (active unit %d) sid=%x\n", pTexture->oglId.texture, activeTexture, i,
+                       activeTextureUnit - GL_TEXTURE0, pContext->aSidActiveTexture[i]));
+# endif
         }
     }