Changeset 81903 in vbox for trunk/src/VBox

Timestamp:

Nov 17, 2019 10:42:29 AM (5 years ago)

Author:

vboxsync

Message:

Devices/Graphics: D3D backend: use the vertex attribute index to access the SVGA3dVertexDivisor array; OpenGL backend: never update an attribute with the zero stride to the next element

Location:

trunk/src/VBox/Devices/Graphics

Files:

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

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

@@ -5838 +5838 @@
 int vmsvga3dDrawPrimitivesProcessVertexDecls(PVGASTATE pThis, PVMSVGA3DCONTEXT pContext,
                                              uint32_t iVertexDeclBase, uint32_t numVertexDecls,
-                                             SVGA3dVertexDecl *pVertexDecl, SVGA3dVertexDivisor const *paVertexDivisors)
+                                             SVGA3dVertexDecl *pVertexDecl,
+                                             SVGA3dVertexDivisor const *paVertexDivisors, uint32_t cInstances)
 {
     PVMSVGA3DSTATE      pState = pThis->svga.p3dState;
@@ -5909 +5910 @@
 
             GLuint divisor = paVertexDivisors && paVertexDivisors[index].s.instanceData ? 1 : 0;
-            if (pVertexDecl[iVertex].array.stride == 0 && divisor == 0)
+            if (pVertexDecl[iVertex].array.stride == 0)
             {
                 /* Zero stride means that the attribute pointer must not be increased.
                  * See comment about stride in vmsvga3dDrawPrimitives.
                  */
-                LogRelMax(8, ("VMSVGA: Warning: zero stride array (instancing %s)\n", paVertexDivisors ? "on" : "off"));
-                AssertFailed();
-                divisor = 1;
+                if (!divisor)
+                {
+                    LogRelMax(8, ("VMSVGA: zero stride array (instancing %s %d)\n", paVertexDivisors ? "on" : "off", cInstances));
+                    AssertFailed();
+                }
+
+                divisor = cInstances; /* This attrib must never advance. */
             }
             pState->ext.glVertexAttribDivisor(index, divisor);
@@ -6246 +6251 @@
 
         rc = vmsvga3dDrawPrimitivesProcessVertexDecls(pThis, pContext, iCurrentVertex, iVertex - iCurrentVertex,
-                                                      &pVertexDecl[iCurrentVertex], pVertexDivisor);
+                                                      &pVertexDecl[iCurrentVertex], pVertexDivisor, cInstances);
         AssertRCReturn(rc, rc);
 

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

@@ -5163 +5163 @@
         if (cVertexDivisor)
         {
-            LogFunc(("SetStreamSourceFreq[%d]=%x\n", iCurrentStreamId, pVertexDivisor[iCurrentStreamId].value));
+            LogFunc(("SetStreamSourceFreq[%d]=%x\n", iCurrentStreamId, pVertexDivisor[iCurrentVertex].value));
             HRESULT hr2 = pContext->pDevice->SetStreamSourceFreq(iCurrentStreamId,
-                                                                 pVertexDivisor[iCurrentStreamId].value);
+                                                                 pVertexDivisor[iCurrentVertex].value);
             Assert(SUCCEEDED(hr2)); RT_NOREF(hr2);
         }