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

Timestamp:

May 15, 2022 6:18:16 PM (3 years ago)

Author:

vboxsync

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

151456

Message:

Devices/Graphics: shader signatures: bugref:9830

Location:

trunk/src/VBox/Devices/Graphics

Files:

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

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

@@ -3765 +3765 @@
 {
 #ifdef VMSVGA3D_DX
-    DEBUG_BREAKPOINT_TEST();
+    //DEBUG_BREAKPOINT_TEST();
     RT_NOREF(cbCmd);
     return vmsvga3dDXDestroyUAView(pThisCC, idDXContext, pCmd);

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

@@ -2030 +2030 @@
                 ASSERT_GUEST_RETURN(cbSignaturesAvail >= cbSignature, VERR_INVALID_PARAMETER);
 
-                /* Keep the generated signatures if the guest did not provide any. */
-                if (cSignature != 0)
-                {
-                    /* Copy to DXShaderInfo. */
-                    uint8_t const *pu8Signatures = (uint8_t *)&pSignatureHeader[1];
-                    pShaderInfo->cInputSignature = pSignatureHeader->numInputSignatures;
-                    memcpy(pShaderInfo->aInputSignature, pu8Signatures, pSignatureHeader->numInputSignatures * sizeof(SVGA3dDXSignatureEntry));
-
-                    pu8Signatures += pSignatureHeader->numInputSignatures * sizeof(SVGA3dDXSignatureEntry);
-                    pShaderInfo->cOutputSignature = pSignatureHeader->numOutputSignatures;
-                    memcpy(pShaderInfo->aOutputSignature, pu8Signatures, pSignatureHeader->numOutputSignatures * sizeof(SVGA3dDXSignatureEntry));
-
-                    pu8Signatures += pSignatureHeader->numOutputSignatures * sizeof(SVGA3dDXSignatureEntry);
-                    pShaderInfo->cPatchConstantSignature = pSignatureHeader->numPatchConstantSignatures;
-                    memcpy(pShaderInfo->aPatchConstantSignature, pu8Signatures, pSignatureHeader->numPatchConstantSignatures * sizeof(SVGA3dDXSignatureEntry));
-
-                    /* The shader does not need guesswork. */
-                    pShaderInfo->fGuestSignatures = true;
-                }
+                /* The shader does not need guesswork. */
+                pShaderInfo->fGuestSignatures = true;
+
+                /* Copy to DXShaderInfo. */
+                uint8_t const *pu8Signatures = (uint8_t *)&pSignatureHeader[1];
+                pShaderInfo->cInputSignature = pSignatureHeader->numInputSignatures;
+                memcpy(pShaderInfo->aInputSignature, pu8Signatures, pSignatureHeader->numInputSignatures * sizeof(SVGA3dDXSignatureEntry));
+
+                pu8Signatures += pSignatureHeader->numInputSignatures * sizeof(SVGA3dDXSignatureEntry);
+                pShaderInfo->cOutputSignature = pSignatureHeader->numOutputSignatures;
+                memcpy(pShaderInfo->aOutputSignature, pu8Signatures, pSignatureHeader->numOutputSignatures * sizeof(SVGA3dDXSignatureEntry));
+
+                pu8Signatures += pSignatureHeader->numOutputSignatures * sizeof(SVGA3dDXSignatureEntry);
+                pShaderInfo->cPatchConstantSignature = pSignatureHeader->numPatchConstantSignatures;
+                memcpy(pShaderInfo->aPatchConstantSignature, pu8Signatures, pSignatureHeader->numPatchConstantSignatures * sizeof(SVGA3dDXSignatureEntry));
             }
         }

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

@@ -5279 +5279 @@
 
 
+static void vboxDXMatchGuestShaderSignatures(PVMSVGA3DDXCONTEXT pDXContext, DXSHADER *pDXShader)
+{
+    if (pDXShader->enmShaderType == SVGA3D_SHADERTYPE_GS)
+    {
+        /* Output signature of a GS shader is the input of the pixel shader. */
+        SVGA3dShaderId const shaderIdPS = pDXContext->svgaDXContext.shaderState[SVGA3D_SHADERTYPE_PS - SVGA3D_SHADERTYPE_MIN].shaderId;
+        SVGA3dShaderId const shaderIdDS = pDXContext->svgaDXContext.shaderState[SVGA3D_SHADERTYPE_DS - SVGA3D_SHADERTYPE_MIN].shaderId;
+        SVGA3dShaderId const shaderIdVS = pDXContext->svgaDXContext.shaderState[SVGA3D_SHADERTYPE_VS - SVGA3D_SHADERTYPE_MIN].shaderId;
+
+        if (shaderIdPS != SVGA3D_INVALID_ID)
+        {
+            DXSHADER const *pDXShaderPS = &pDXContext->pBackendDXContext->paShader[shaderIdPS];
+            pDXShader->shaderInfo.cOutputSignature = pDXShaderPS->shaderInfo.cInputSignature;
+            memcpy(pDXShader->shaderInfo.aOutputSignature,
+                   pDXShaderPS->shaderInfo.aInputSignature,
+                   pDXShaderPS->shaderInfo.cInputSignature * sizeof(SVGA3dDXSignatureEntry));
+        }
+
+        /* Input signature of a GS shader is the output of DS or VS. */
+        if (shaderIdDS != SVGA3D_INVALID_ID)
+        {
+            DXSHADER *pDXShaderDS = &pDXContext->pBackendDXContext->paShader[shaderIdDS];
+            pDXShader->shaderInfo.cInputSignature = pDXShaderDS->shaderInfo.cOutputSignature;
+            memcpy(pDXShader->shaderInfo.aInputSignature,
+                   pDXShaderDS->shaderInfo.aOutputSignature,
+                   pDXShaderDS->shaderInfo.cOutputSignature * sizeof(SVGA3dDXSignatureEntry));
+        }
+        else if (shaderIdVS != SVGA3D_INVALID_ID)
+        {
+            DXSHADER *pDXShaderVS = &pDXContext->pBackendDXContext->paShader[shaderIdVS];
+            pDXShader->shaderInfo.cInputSignature = pDXShaderVS->shaderInfo.cOutputSignature;
+            memcpy(pDXShader->shaderInfo.aInputSignature,
+                   pDXShaderVS->shaderInfo.aOutputSignature,
+                   pDXShaderVS->shaderInfo.cOutputSignature * sizeof(SVGA3dDXSignatureEntry));
+        }
+    }
+    Assert(   (pDXShader->enmShaderType == SVGA3D_SHADERTYPE_VS || pDXShader->enmShaderType == SVGA3D_SHADERTYPE_PS)
+           || (pDXShader->shaderInfo.cInputSignature && pDXShader->shaderInfo.cOutputSignature));
+}
+
+
 static void dxCreateInputLayout(PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext, SVGA3dElementLayoutId elementLayoutId, DXSHADER *pDXShader)
 {
@@ -5624 +5665 @@
                     AssertRC(rc); /* Ignore rc because the shader will most likely work anyway. */
                 }
+
+                if (pDXShader->shaderInfo.fGuestSignatures)
+                    vboxDXMatchGuestShaderSignatures(pDXContext, pDXShader);
 
                 rc = DXShaderCreateDXBC(&pDXShader->shaderInfo, &pDXShader->pvDXBC, &pDXShader->cbDXBC);