Changeset 95091 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

May 25, 2022 10:29:30 AM (3 years ago)

Author:

vboxsync

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

151566

Message:

Devices/Graphics: stream output: bugref:9830

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-win-dx.cpp (modified) (2 diffs)
• DevVGA-SVGA3d.cpp (modified) (1 diff)

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

@@ -1280 +1280 @@
     if (pEntry->usesMob)
     {
-        DEBUG_BREAKPOINT_TEST();
         pMob = vmsvgaR3MobGet(pSvgaR3State, pEntry->mobid);
         ASSERT_GUEST_RETURN(pMob, VERR_INVALID_PARAMETER);
@@ -1306 +1305 @@
 
         pDst->Stream         = pSrc->stream;
-        pDst->SemanticName   = NULL; /* Will be taken from the shader output declaration. */
+        pDst->SemanticName   = NULL; /* Semantic name and index will be taken from the shader output declaration. */
         pDst->SemanticIndex  = 0;
-        pDst->StartComponent = iFirstBit > 0 ? iFirstBit - 1 : 0;
+        /* A geometry shader may return an attribute as a component:
+         *   Name   Index Mask Register
+         *   ATTRIB 3       z  2
+         * In this case SO declaration expects StartComponent = 0 and ComponentCount = 1
+         * (not StartComponent = 2 and ComponentCount = 1)
+         * This 'StartComponent = iFirstBit > 0 ? iFirstBit - 1 : 0;' did not work with a sample from a D3D11 book.
+         */
+        pDst->StartComponent = 0;
         pDst->ComponentCount = iFirstBit > 0 ? iLastBit - (iFirstBit - 1) : 0;
         pDst->OutputSlot     = pSrc->outputSlot;

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

@@ -1468 +1468 @@
                            pMipLevel->pSurfaceData, pMipLevel->cbSurfacePitch, pMipLevel->cbSurfacePlane);
 
-    LogFunc(("SysMem: pvData %p\n", pMap->pvData));
+    LogFunc(("SysMem: sid = %u, pvData %p\n", pImage->sid, pMap->pvData));
     return VINF_SUCCESS;
 }