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

Timestamp:

Aug 2, 2024 12:53:54 PM (9 months ago)

Author:

vboxsync

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

164247

Message:

Devices/Graphics,WDDM: Implemented DEFINE_RASTERIZER_STATE_V2

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA-cmd.cpp (modified) (3 diffs)
• DevVGA-SVGA3d-dx-dx11.cpp (modified) (1 diff)
• DevVGA-SVGA3d-dx.cpp (modified) (2 diffs)
• DevVGA-SVGA3d.h (modified) (1 diff)
• vmsvga_include/svga3d_cmd.h (modified) (1 diff)
• vmsvga_include/svga3d_dx.h (modified) (1 diff)
• vmsvga_include/vbsvga3d_dx.h (modified) (1 diff)

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

@@ -297 +297 @@
         SVGA_CASE_ID2STR(SVGA_3D_CMD_SURFACE_STRETCHBLT_NON_MS_TO_MS);
         SVGA_CASE_ID2STR(SVGA_3D_CMD_DX_BIND_SHADER_IFACE);
+        SVGA_CASE_ID2STR(SVGA_3D_CMD_DX_DEFINE_RASTERIZER_STATE_V2);
         SVGA_CASE_ID2STR(SVGA_3D_CMD_MAX);
         SVGA_CASE_ID2STR(SVGA_3D_CMD_FUTURE_MAX);
@@ -3122 +3123 @@
     //DEBUG_BREAKPOINT_TEST();
     RT_NOREF(cbCmd);
+    SVGA3dCmdDXDefineRasterizerState_v2 cmd;
+    cmd.rasterizerId          = pCmd->rasterizerId;
+    cmd.fillMode              = pCmd->fillMode;
+    cmd.cullMode              = pCmd->cullMode;
+    cmd.frontCounterClockwise = pCmd->frontCounterClockwise;
+    cmd.provokingVertexLast   = pCmd->provokingVertexLast;
+    cmd.depthBias             = pCmd->depthBias;
+    cmd.depthBiasClamp        = pCmd->depthBiasClamp;
+    cmd.slopeScaledDepthBias  = pCmd->slopeScaledDepthBias;
+    cmd.depthClipEnable       = pCmd->depthClipEnable;
+    cmd.scissorEnable         = pCmd->scissorEnable;
+    cmd.multisampleEnable     = pCmd->multisampleEnable;
+    cmd.antialiasedLineEnable = pCmd->antialiasedLineEnable;
+    cmd.lineWidth             = pCmd->lineWidth;
+    cmd.lineStippleEnable     = pCmd->lineStippleEnable;
+    cmd.lineStippleFactor     = pCmd->lineStippleFactor;
+    cmd.lineStipplePattern    = pCmd->lineStipplePattern;
+    cmd.forcedSampleCount     = 0;
+    return vmsvga3dDXDefineRasterizerState(pThisCC, idDXContext, &cmd);
+#else
+    RT_NOREF(pThisCC, idDXContext, pCmd, cbCmd);
+    return VERR_NOT_SUPPORTED;
+#endif
+}
+
+
+/* SVGA_3D_CMD_DX_DEFINE_RASTERIZER_STATE_V2 1288 */
+static int vmsvga3dCmdDXDefineRasterizerState_v2(PVGASTATECC pThisCC, uint32_t idDXContext, SVGA3dCmdDXDefineRasterizerState_v2 const *pCmd, uint32_t cbCmd)
+{
+#ifdef VMSVGA3D_DX
+    //DEBUG_BREAKPOINT_TEST();
+    RT_NOREF(cbCmd);
     return vmsvga3dDXDefineRasterizerState(pThisCC, idDXContext, pCmd);
 #else
@@ -6840 +6873 @@
         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
         rcParse = vmsvga3dCmdVBDXClearRenderTargetViewRegion(pThisCC, idDXContext, pCmd, cbCmd);
+        break;
+    }
+
+    case SVGA_3D_CMD_DX_DEFINE_RASTERIZER_STATE_V2:
+    {
+        SVGA3dCmdDXDefineRasterizerState_v2 *pCmd = (SVGA3dCmdDXDefineRasterizerState_v2 *)pvCmd;
+        VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
+        rcParse = vmsvga3dCmdDXDefineRasterizerState_v2(pThisCC, idDXContext, pCmd, cbCmd);
         break;
     }

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

@@ -4057 +4057 @@
         if (pState->pBackend->dxDevice.pVideoDevice)
             *pu32Val |= VBSVGA3D_CAP_VIDEO;
+        *pu32Val |= VBSVGA3D_CAP_RASTERIZER_STATE_V2;
         break;
 

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

@@ -1746 +1746 @@
 
 
-int vmsvga3dDXDefineRasterizerState(PVGASTATECC pThisCC, uint32_t idDXContext, SVGA3dCmdDXDefineRasterizerState const *pCmd)
+int vmsvga3dDXDefineRasterizerState(PVGASTATECC pThisCC, uint32_t idDXContext, SVGA3dCmdDXDefineRasterizerState_v2 const *pCmd)
 {
     int rc;
@@ -1780 +1780 @@
     pEntry->lineStippleFactor     = pCmd->lineStippleFactor;
     pEntry->lineStipplePattern    = pCmd->lineStipplePattern;
-    pEntry->forcedSampleCount     = 0; /** @todo Not in pCmd. */
+    pEntry->forcedSampleCount     = pCmd->forcedSampleCount;
     RT_ZERO(pEntry->mustBeZero);
 

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

@@ -683 +683 @@
 int vmsvga3dDXDefineDepthStencilState(PVGASTATECC pThisCC, uint32_t idDXContext, SVGA3dCmdDXDefineDepthStencilState const *pCmd);
 int vmsvga3dDXDestroyDepthStencilState(PVGASTATECC pThisCC, uint32_t idDXContext, SVGA3dCmdDXDestroyDepthStencilState const *pCmd);
-int vmsvga3dDXDefineRasterizerState(PVGASTATECC pThisCC, uint32_t idDXContext, SVGA3dCmdDXDefineRasterizerState const *pCmd);
+int vmsvga3dDXDefineRasterizerState(PVGASTATECC pThisCC, uint32_t idDXContext, SVGA3dCmdDXDefineRasterizerState_v2 const *pCmd);
 int vmsvga3dDXDestroyRasterizerState(PVGASTATECC pThisCC, uint32_t idDXContext, SVGA3dCmdDXDestroyRasterizerState const *pCmd);
 int vmsvga3dDXDefineSamplerState(PVGASTATECC pThisCC, uint32_t idDXContext, SVGA3dCmdDXDefineSamplerState const *pCmd);

trunk/src/VBox/Devices/Graphics/vmsvga_include/svga3d_cmd.h

@@ -335 +335 @@
    SVGA_3D_CMD_DX_BIND_SHADER_IFACE                       = 1277,
 
-   SVGA_3D_CMD_MAX                                        = 1278,
+   SVGA_3D_CMD_DX_DEFINE_RASTERIZER_STATE_V2              = 1288,
+
+   SVGA_3D_CMD_MAX                                        = 1303,
    SVGA_3D_CMD_FUTURE_MAX                                 = 3000
 

trunk/src/VBox/Devices/Graphics/vmsvga_include/svga3d_dx.h

@@ -1579 +1579 @@
 /* SVGA_3D_CMD_DX_DEFINE_RASTERIZER_STATE */
 
+typedef struct SVGA3dCmdDXDefineRasterizerState_v2 {
+    SVGA3dRasterizerStateId rasterizerId;
+
+    uint8 fillMode;
+    SVGA3dCullMode cullMode;
+    uint8 frontCounterClockwise;
+    uint8 provokingVertexLast;
+    int32 depthBias;
+    float depthBiasClamp;
+    float slopeScaledDepthBias;
+    uint8 depthClipEnable;
+    uint8 scissorEnable;
+    SVGA3dMultisampleRastEnable multisampleEnable;
+    uint8 antialiasedLineEnable;
+    float lineWidth;
+    uint8 lineStippleEnable;
+    uint8 lineStippleFactor;
+    uint16 lineStipplePattern;
+    uint32 forcedSampleCount;
+} SVGA3dCmdDXDefineRasterizerState_v2;
+
 typedef
 #include "vmware_pack_begin.h"

trunk/src/VBox/Devices/Graphics/vmsvga_include/vbsvga3d_dx.h

@@ -34 +34 @@
 /* Video decoding/processing and ClearView commands. */
 #define VBSVGA3D_CAP_VIDEO 0x00000002
+/* The host supports SVGA_3D_CMD_DX_DEFINE_RASTERIZER_STATE_V2 command. */
+#define VBSVGA3D_CAP_RASTERIZER_STATE_V2 0x00000004
 
 /* Arbitrary limits. Allows to use constant size structures.