Changeset 82408 in vbox for trunk/src

Timestamp:

Dec 5, 2019 11:42:25 AM (5 years ago)

Author:

vboxsync

Message:

Devices/Graphics: OpenGL backend: move a code block to where is belongs, use a helper to get the surface

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp (modified) (2 diffs)

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

@@ -6328 +6328 @@
     }
 
+    /* Flush any shader changes; after (!) checking the vertex declarations to deal with pre-transformed vertices. */
+    if (pContext->pShaderContext)
+    {
+        uint32_t rtHeight = 0;
+
+        if (pContext->state.aRenderTargets[SVGA3D_RT_COLOR0] != SVGA_ID_INVALID)
+        {
+            PVMSVGA3DSURFACE pRenderTarget;
+            rc = vmsvga3dSurfaceFromSid(pState, pContext->state.aRenderTargets[SVGA3D_RT_COLOR0], &pRenderTarget);
+            AssertRCReturn(rc, rc);
+
+            rtHeight = pRenderTarget->paMipmapLevels[0].mipmapSize.height;
+        }
+
+        ShaderUpdateState(pContext->pShaderContext, rtHeight);
+    }
+
     /*
      * D3D and OpenGL have a different meaning of value zero for the vertex array stride:
@@ -6396 +6413 @@
             Assert(pVertexDivisor[iVertexDivisor].s.count == 1);
         }
-    }
-
-    /* Flush any shader changes; after (!) checking the vertex declarations to deal with pre-transformed vertices. */
-    if (pContext->pShaderContext)
-    {
-        uint32_t rtHeight = 0;
-
-        if (pContext->state.aRenderTargets[SVGA3D_RT_COLOR0] != SVGA_ID_INVALID)
-        {
-            PVMSVGA3DSURFACE pRenderTarget = pState->papSurfaces[pContext->state.aRenderTargets[SVGA3D_RT_COLOR0]];
-            rtHeight = pRenderTarget->paMipmapLevels[0].mipmapSize.height;
-        }
-
-        ShaderUpdateState(pContext->pShaderContext, rtHeight);
     }