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

Timestamp:

May 9, 2022 6:56:53 AM (3 years ago)

Author:

vboxsync

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

151336

Message:

Devices/Graphics: shader parser update; minor fixes: bugref:9830

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA-cmd.cpp (modified) (4 diffs)
• DevVGA-SVGA3d-dx-shader.cpp (modified) (4 diffs)
• DevVGA-SVGA3d-dx.cpp (modified) (3 diffs)

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

@@ -2917 +2917 @@
 {
 #ifdef VMSVGA3D_DX
-    DEBUG_BREAKPOINT_TEST();
+    //DEBUG_BREAKPOINT_TEST();
     RT_NOREF(cbCmd);
     return vmsvga3dDXDestroyBlendState(pThisCC, idDXContext, pCmd);
@@ -2945 +2945 @@
 {
 #ifdef VMSVGA3D_DX
-    DEBUG_BREAKPOINT_TEST();
+    //DEBUG_BREAKPOINT_TEST();
     RT_NOREF(cbCmd);
     return vmsvga3dDXDestroyDepthStencilState(pThisCC, idDXContext, pCmd);
@@ -2973 +2973 @@
 {
 #ifdef VMSVGA3D_DX
-    DEBUG_BREAKPOINT_TEST();
+    //DEBUG_BREAKPOINT_TEST();
     RT_NOREF(cbCmd);
     return vmsvga3dDXDestroyRasterizerState(pThisCC, idDXContext, pCmd);
@@ -3001 +3001 @@
 {
 #ifdef VMSVGA3D_DX
-    DEBUG_BREAKPOINT_TEST();
+    //DEBUG_BREAKPOINT_TEST();
     RT_NOREF(cbCmd);
     return vmsvga3dDXDestroySamplerState(pThisCC, idDXContext, pCmd);

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

@@ -31 +31 @@
 #include "DevVGA-SVGA3d-dx-shader.h"
 
+#include <d3d11TokenizedProgramFormat.hpp>
 
 /*
@@ -1515 +1516 @@
 
         pOpcode->cOpcodeToken = opcode.instructionLength;
+        uint32_t cOpcode = 1; /* Opcode token + extended opcode tokens. */
         if (opcode.extended)
         {
-            ASSERT_GUEST_RETURN(dxbcTokenReaderCanRead(r, 1), VERR_INVALID_PARAMETER);
             if (   pOpcode->opcodeType == VGPU10_OPCODE_DCL_FUNCTION_BODY
                 || pOpcode->opcodeType == VGPU10_OPCODE_DCL_FUNCTION_TABLE
@@ -1525 +1526 @@
             {
                 /* "next DWORD contains ... the actual instruction length in DWORD since it may not fit into 7 bits" */
+                ASSERT_GUEST_RETURN(dxbcTokenReaderCanRead(r, 1), VERR_INVALID_PARAMETER);
                 pOpcode->cOpcodeToken = dxbcTokenReaderRead32(r);
+                ++cOpcode;
             }
             else
             {
                 VGPU10OpcodeToken1 opcode1;
-                opcode1.value = dxbcTokenReaderRead32(r);
-                ASSERT_GUEST(opcode1.opcodeType == VGPU10_EXTENDED_OPCODE_SAMPLE_CONTROLS);
+                do
+                {
+                    ASSERT_GUEST_RETURN(dxbcTokenReaderCanRead(r, 1), VERR_INVALID_PARAMETER);
+                    opcode1.value = dxbcTokenReaderRead32(r);
+                    ++cOpcode;
+                    ASSERT_GUEST(   opcode1.opcodeType == VGPU10_EXTENDED_OPCODE_SAMPLE_CONTROLS
+                                 || opcode1.opcodeType == D3D11_SB_EXTENDED_OPCODE_RESOURCE_DIM
+                                 || opcode1.opcodeType == D3D11_SB_EXTENDED_OPCODE_RESOURCE_RETURN_TYPE);
+                } while(opcode1.extended);
             }
         }
 
         ASSERT_GUEST_RETURN(pOpcode->cOpcodeToken >= 1 && pOpcode->cOpcodeToken < 256, VERR_INVALID_PARAMETER);
-        ASSERT_GUEST_RETURN(dxbcTokenReaderCanRead(r, pOpcode->cOpcodeToken - 1), VERR_INVALID_PARAMETER);
+        ASSERT_GUEST_RETURN(dxbcTokenReaderCanRead(r, pOpcode->cOpcodeToken - cOpcode), VERR_INVALID_PARAMETER);
 
 #ifdef LOG_ENABLED
@@ -2424 +2434 @@
 int DXShaderUpdateResourceTypes(DXShaderInfo const *pInfo, VGPU10_RESOURCE_DIMENSION *paResourceType, uint32_t cResourceType)
 {
+    if (pInfo->fGuestSignatures)
+        return VINF_SUCCESS;
+
     for (uint32_t i = 0; i < pInfo->cDclResource; ++i)
     {

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

@@ -902 +902 @@
     SVGA3dBlendStateId const blendId = pCmd->blendId;
 
-    ASSERT_GUEST_RETURN(pDXContext->cot.paBlendState, VERR_INVALID_STATE);
-    ASSERT_GUEST_RETURN(blendId < pDXContext->cot.cBlendState, VERR_INVALID_PARAMETER);
+    ASSERT_GUEST_RETURN(   blendId == SVGA3D_INVALID_ID
+                        || blendId < pDXContext->cot.cBlendState, VERR_INVALID_PARAMETER);
     RT_UNTRUSTED_VALIDATED_FENCE();
 
@@ -930 +930 @@
     SVGA3dDepthStencilStateId const depthStencilId = pCmd->depthStencilId;
 
-    ASSERT_GUEST_RETURN(pDXContext->cot.paDepthStencil, VERR_INVALID_STATE);
-    ASSERT_GUEST_RETURN(depthStencilId < pDXContext->cot.cDepthStencil, VERR_INVALID_PARAMETER);
+    ASSERT_GUEST_RETURN(   depthStencilId == SVGA3D_INVALID_ID
+                        || depthStencilId < pDXContext->cot.cDepthStencil, VERR_INVALID_PARAMETER);
     RT_UNTRUSTED_VALIDATED_FENCE();
 
@@ -954 +954 @@
     AssertRCReturn(rc, rc);
 
-    ASSERT_GUEST_RETURN(rasterizerId < pDXContext->cot.cRasterizerState, VERR_INVALID_PARAMETER);
+    ASSERT_GUEST_RETURN(   rasterizerId == SVGA3D_INVALID_ID
+                        || rasterizerId < pDXContext->cot.cRasterizerState, VERR_INVALID_PARAMETER);
     RT_UNTRUSTED_VALIDATED_FENCE();