Changeset 69905 in vbox for trunk/src/VBox/Devices

Timestamp:

Dec 2, 2017 9:27:46 AM (7 years ago)

Author:

vboxsync

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

119382

Message:

Devices/Graphics: VMSVGA: do not recreate D3D vertex declaration if it has not changed.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-internal.h (modified) (1 diff)
• DevVGA-SVGA3d-win.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-internal.h

@@ -831 +831 @@
     /* Occlusion query. */
     VMSVGA3DQUERY occlusion;
+
+#ifdef VMSVGA3D_DIRECT3D
+    /* State which is currently applied to the D3D device. It is recreated as needed and not saved.
+     * The purpose is to remember the currently applied state and do not re-apply it if it has not changed.
+     * Unnecessary state changes are very bad for performance.
+     */
+    struct
+    {
+        /* Vertex declaration. */
+        IDirect3DVertexDeclaration9 *pVertexDecl;
+        uint32_t cVertexElements;
+        D3DVERTEXELEMENT9 aVertexElements[SVGA3D_MAX_VERTEX_ARRAYS + 1];
+    } d3dState;
+#endif
 } VMSVGA3DCONTEXT;
 /** Pointer to a VMSVGA3d context. */

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

@@ -2893 +2893 @@
         Log(("vmsvga3dContextDestroy id %x\n", cid));
 
+        /* Cleanup the device runtime state. */
+        D3D_RELEASE(pContext->d3dState.pVertexDecl);
+
         /* Check for all surfaces that are associated with this context to remove all dependencies */
         for (uint32_t sid = 0; sid < pState->cSurfaces; sid++)
@@ -3165 +3168 @@
             }
 #endif /* #ifdef VMSVGA3D_DIRECT3D9_RESET */
+
+            /* Cleanup the device runtime state. */
+            D3D_RELEASE(pContext->d3dState.pVertexDecl);
+
             memset(&cs, 0, sizeof(cs));
             cs.cx = pThis->svga.uWidth;
@@ -5810 +5817 @@
     memcpy(&aVertexElements[numVertexDecls], &sVertexEnd, sizeof(sVertexEnd));
 
-    /* Create and set the vertex declaration. */
-    IDirect3DVertexDeclaration9 *pVertexDeclD3D = NULL;
-    hr = pContext->pDevice->CreateVertexDeclaration(&aVertexElements[0], &pVertexDeclD3D);
-    AssertMsgReturn(hr == D3D_OK, ("CreateVertexDeclaration failed with %x\n", hr), VERR_INTERNAL_ERROR);
-
-    hr = pContext->pDevice->SetVertexDeclaration(pVertexDeclD3D);
-    AssertMsgReturnStmt(hr == D3D_OK, ("SetVertexDeclaration failed with %x\n", hr),
-                        D3D_RELEASE(pVertexDeclD3D), VERR_INTERNAL_ERROR);
+    /* Check if this context already has the same vertex declaration. */
+    if (   pContext->d3dState.pVertexDecl
+        && pContext->d3dState.cVertexElements == numVertexDecls + 1
+        && memcmp(pContext->d3dState.aVertexElements,
+                  aVertexElements,
+                  pContext->d3dState.cVertexElements * sizeof(aVertexElements[0])) == 0)
+    {
+       /* Same. */
+    }
+    else
+    {
+        D3D_RELEASE(pContext->d3dState.pVertexDecl);
+
+        pContext->d3dState.cVertexElements = numVertexDecls + 1;
+        memcpy(pContext->d3dState.aVertexElements,
+               aVertexElements,
+               pContext->d3dState.cVertexElements * sizeof(aVertexElements[0]));
+
+        /* Create and set the vertex declaration. */
+        hr = pContext->pDevice->CreateVertexDeclaration(&aVertexElements[0], &pContext->d3dState.pVertexDecl);
+        AssertMsgReturn(hr == D3D_OK, ("CreateVertexDeclaration failed with %x\n", hr), VERR_INTERNAL_ERROR);
+
+        hr = pContext->pDevice->SetVertexDeclaration(pContext->d3dState.pVertexDecl);
+        AssertMsgReturnStmt(hr == D3D_OK, ("SetVertexDeclaration failed with %x\n", hr),
+                            D3D_RELEASE(pContext->d3dState.pVertexDecl),
+                            VERR_INTERNAL_ERROR);
+    }
 
     /* Begin a scene before rendering anything. */
     hr = pContext->pDevice->BeginScene();
-    AssertMsgReturnStmt(hr == D3D_OK, ("BeginScene failed with %x\n", hr),
-                        D3D_RELEASE(pVertexDeclD3D), VERR_INTERNAL_ERROR);
+    AssertMsgReturn(hr == D3D_OK, ("BeginScene failed with %x\n", hr), VERR_INTERNAL_ERROR);
 
     /* Now draw the primitives. */
@@ -5919 +5944 @@
     }
 
-    /* Release vertex declaration, end the scene and do some cleanup regardless of the rc. */
-    D3D_RELEASE(pVertexDeclD3D);
-
+    /* End the scene and do some cleanup regardless of the rc. */
     hr = pContext->pDevice->EndScene();
     AssertMsgReturn(hr == D3D_OK, ("EndScene failed with %x\n", hr), VERR_INTERNAL_ERROR);