Changeset 69242 in vbox

Timestamp:

Oct 24, 2017 4:22:20 PM (7 years ago)

Author:

vboxsync

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

118555

Message:

Devices/Graphics: VMSVGA: support vertex divisors in vmsvga3dDrawPrimitives.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.cpp (modified) (1 diff)
• DevVGA-SVGA3d-win.cpp (modified) (3 diffs)

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

@@ -4055 +4055 @@
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dDrawPrimitives);
 
-                        uint32_t cVertexDivisor = (pHdr->size - sizeof(*pCmd) - sizeof(SVGA3dVertexDecl) * pCmd->numVertexDecls - sizeof(SVGA3dPrimitiveRange) * pCmd->numRanges);
+                        uint32_t cVertexDivisor = (pHdr->size - sizeof(*pCmd) - sizeof(SVGA3dVertexDecl) * pCmd->numVertexDecls - sizeof(SVGA3dPrimitiveRange) * pCmd->numRanges) / sizeof(uint32_t);
                         Assert(pCmd->numRanges <= SVGA3D_MAX_DRAW_PRIMITIVE_RANGES);
                         Assert(pCmd->numVertexDecls <= SVGA3D_MAX_VERTEX_ARRAYS);

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

@@ -5237 +5237 @@
     AssertReturn(numRanges && numRanges <= SVGA3D_MAX_DRAW_PRIMITIVE_RANGES, VERR_INVALID_PARAMETER);
     AssertReturn(!cVertexDivisor || cVertexDivisor == numVertexDecls, VERR_INVALID_PARAMETER);
-    /** @todo */
-    Assert(!cVertexDivisor);
 
     rc = vmsvga3dContextFromCid(pState, cid, &pContext);
@@ -5284 +5282 @@
         if (RT_FAILURE(rc))
             goto internal_error;
+
+        if (cVertexDivisor)
+        {
+            LogFunc(("SetStreamSourceFreq[%d]=%x\n", iCurrentStreamId, pVertexDivisor[iCurrentStreamId].value));
+            HRESULT hr2 = pContext->pDevice->SetStreamSourceFreq(iCurrentStreamId, pVertexDivisor[iCurrentStreamId].value);
+            Assert(SUCCEEDED(hr2));
+        }
 
         iCurrentVertex = iVertex;
@@ -5463 +5468 @@
             hr = pContext->pDevice->SetStreamSource(i, NULL, 0, 0);
             AssertMsgReturn(hr == D3D_OK, ("vmsvga3dDrawPrimitives: SetStreamSource failed with %x\n", hr), VERR_INTERNAL_ERROR);
+        }
+    }
+
+    if (cVertexDivisor)
+    {
+        /* "When you are finished rendering the instance data, be sure to reset the vertex stream frequency back..." */
+        for (uint32_t i = 0; i < cVertexDivisor; ++i)
+        {
+            HRESULT hr2 = pContext->pDevice->SetStreamSourceFreq(i, 1);
+            Assert(SUCCEEDED(hr2));
         }
     }