Changeset 88803 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA-SVGA-cmd.cpp

Timestamp:

Apr 30, 2021 1:23:05 PM (4 years ago)

Author:

vboxsync

Message:

Devices/Graphics: more DX commands; disassemble shaders for debug log. bugref:9830

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA-cmd.cpp (modified) (13 diffs)

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

@@ -1978 +1978 @@
 {
 #ifdef VMSVGA3D_DX
-ASMBreakpoint();
-    PVMSVGAR3STATE const pSvgaR3State = pThisCC->svga.pSvgaR3State;
-    RT_NOREF(pSvgaR3State, pCmd, cbCmd);
-    return vmsvga3dDXSetShaderResources(pThisCC, idDXContext);
+//ASMBreakpoint();
+    SVGA3dShaderResourceViewId const *paShaderResourceViewId = (SVGA3dShaderResourceViewId *)&pCmd[1];
+    uint32_t const cShaderResourceViewId = (cbCmd - sizeof(*pCmd)) / sizeof(SVGA3dShaderResourceViewId);
+    return vmsvga3dDXSetShaderResources(pThisCC, idDXContext, pCmd, cShaderResourceViewId, paShaderResourceViewId);
 #else
     RT_NOREF(pThisCC, idDXContext, pCmd, cbCmd);
@@ -2010 +2010 @@
     SVGA3dSamplerId const *paSamplerId = (SVGA3dSamplerId *)&pCmd[1];
     uint32_t const cSamplerId = (cbCmd - sizeof(*pCmd)) / sizeof(SVGA3dSamplerId);
-    return vmsvga3dDXSetSamplers(pThisCC, idDXContext, pCmd->startSampler, pCmd->type, cSamplerId, paSamplerId);
+    return vmsvga3dDXSetSamplers(pThisCC, idDXContext, pCmd, cSamplerId, paSamplerId);
 #else
     RT_NOREF(pThisCC, idDXContext, pCmd, cbCmd);
@@ -2036 +2036 @@
 {
 #ifdef VMSVGA3D_DX
-ASMBreakpoint();
+//ASMBreakpoint();
     RT_NOREF(cbCmd);
     return vmsvga3dDXDrawIndexed(pThisCC, idDXContext, pCmd);
@@ -2374 +2374 @@
 {
 #ifdef VMSVGA3D_DX
-ASMBreakpoint();
-    PVMSVGAR3STATE const pSvgaR3State = pThisCC->svga.pSvgaR3State;
-    RT_NOREF(pSvgaR3State, pCmd, cbCmd);
-    return vmsvga3dDXClearRenderTargetView(pThisCC, idDXContext);
+//ASMBreakpoint();
+    RT_NOREF(cbCmd);
+    return vmsvga3dDXClearRenderTargetView(pThisCC, idDXContext, pCmd);
 #else
     RT_NOREF(pThisCC, idDXContext, pCmd, cbCmd);
@@ -2389 +2388 @@
 {
 #ifdef VMSVGA3D_DX
-ASMBreakpoint();
-    PVMSVGAR3STATE const pSvgaR3State = pThisCC->svga.pSvgaR3State;
-    RT_NOREF(pSvgaR3State, pCmd, cbCmd);
-    return vmsvga3dDXClearDepthStencilView(pThisCC, idDXContext);
+//ASMBreakpoint();
+    RT_NOREF(cbCmd);
+    return vmsvga3dDXClearDepthStencilView(pThisCC, idDXContext, pCmd);
 #else
     RT_NOREF(pThisCC, idDXContext, pCmd, cbCmd);
@@ -2404 +2402 @@
 {
 #ifdef VMSVGA3D_DX
-ASMBreakpoint();
-    PVMSVGAR3STATE const pSvgaR3State = pThisCC->svga.pSvgaR3State;
-    RT_NOREF(pSvgaR3State, pCmd, cbCmd);
-    return vmsvga3dDXPredCopyRegion(pThisCC, idDXContext);
+//ASMBreakpoint();
+    RT_NOREF(cbCmd);
+    return vmsvga3dDXPredCopyRegion(pThisCC, idDXContext, pCmd);
 #else
     RT_NOREF(pThisCC, idDXContext, pCmd, cbCmd);
@@ -2449 +2446 @@
 {
 #ifdef VMSVGA3D_DX
-ASMBreakpoint();
-    PVMSVGAR3STATE const pSvgaR3State = pThisCC->svga.pSvgaR3State;
-    RT_NOREF(pSvgaR3State, pCmd, cbCmd);
-    return vmsvga3dDXGenMips(pThisCC, idDXContext);
+//ASMBreakpoint();
+    RT_NOREF(cbCmd);
+    return vmsvga3dDXGenMips(pThisCC, idDXContext, pCmd);
 #else
     RT_NOREF(pThisCC, idDXContext, pCmd, cbCmd);
@@ -2509 +2505 @@
 {
 #ifdef VMSVGA3D_DX
-ASMBreakpoint();
+//ASMBreakpoint();
     RT_NOREF(cbCmd);
     return vmsvga3dDXDefineShaderResourceView(pThisCC, idDXContext, pCmd);
@@ -2523 +2519 @@
 {
 #ifdef VMSVGA3D_DX
-ASMBreakpoint();
-    PVMSVGAR3STATE const pSvgaR3State = pThisCC->svga.pSvgaR3State;
-    RT_NOREF(pSvgaR3State, pCmd, cbCmd);
-    return vmsvga3dDXDestroyShaderResourceView(pThisCC, idDXContext);
+//ASMBreakpoint();
+    RT_NOREF(cbCmd);
+    return vmsvga3dDXDestroyShaderResourceView(pThisCC, idDXContext, pCmd);
 #else
     RT_NOREF(pThisCC, idDXContext, pCmd, cbCmd);
@@ -2552 +2547 @@
 {
 #ifdef VMSVGA3D_DX
-ASMBreakpoint();
-    PVMSVGAR3STATE const pSvgaR3State = pThisCC->svga.pSvgaR3State;
-    RT_NOREF(pSvgaR3State, pCmd, cbCmd);
-    return vmsvga3dDXDestroyRenderTargetView(pThisCC, idDXContext);
+//ASMBreakpoint();
+    RT_NOREF(cbCmd);
+    return vmsvga3dDXDestroyRenderTargetView(pThisCC, idDXContext, pCmd);
 #else
     RT_NOREF(pThisCC, idDXContext, pCmd, cbCmd);
@@ -2567 +2561 @@
 {
 #ifdef VMSVGA3D_DX
-ASMBreakpoint();
-    PVMSVGAR3STATE const pSvgaR3State = pThisCC->svga.pSvgaR3State;
-    RT_NOREF(pSvgaR3State, pCmd, cbCmd);
-    return vmsvga3dDXDefineDepthStencilView(pThisCC, idDXContext);
+//ASMBreakpoint();
+    RT_NOREF(cbCmd);
+    SVGA3dCmdDXDefineDepthStencilView_v2 cmd;
+    cmd.depthStencilViewId = pCmd->depthStencilViewId;
+    cmd.sid                = pCmd->sid;
+    cmd.format             = pCmd->format;
+    cmd.resourceDimension  = pCmd->resourceDimension;
+    cmd.mipSlice           = pCmd->mipSlice;
+    cmd.firstArraySlice    = pCmd->firstArraySlice;
+    cmd.arraySize          = pCmd->arraySize;
+    cmd.flags              = 0;
+    return vmsvga3dDXDefineDepthStencilView(pThisCC, idDXContext, &cmd);
 #else
     RT_NOREF(pThisCC, idDXContext, pCmd, cbCmd);
@@ -2582 +2584 @@
 {
 #ifdef VMSVGA3D_DX
-ASMBreakpoint();
-    PVMSVGAR3STATE const pSvgaR3State = pThisCC->svga.pSvgaR3State;
-    RT_NOREF(pSvgaR3State, pCmd, cbCmd);
-    return vmsvga3dDXDestroyDepthStencilView(pThisCC, idDXContext);
+//ASMBreakpoint();
+    RT_NOREF(cbCmd);
+    return vmsvga3dDXDestroyDepthStencilView(pThisCC, idDXContext, pCmd);
 #else
     RT_NOREF(pThisCC, idDXContext, pCmd, cbCmd);
@@ -3632 +3633 @@
 {
 #ifdef VMSVGA3D_DX
-ASMBreakpoint();
-    PVMSVGAR3STATE const pSvgaR3State = pThisCC->svga.pSvgaR3State;
-    RT_NOREF(pSvgaR3State, pCmd, cbCmd);
-    return vmsvga3dDXDefineDepthStencilView_v2(pThisCC, idDXContext);
+//ASMBreakpoint();
+    RT_NOREF(cbCmd);
+    return vmsvga3dDXDefineDepthStencilView(pThisCC, idDXContext, pCmd);
 #else
     RT_NOREF(pThisCC, idDXContext, pCmd, cbCmd);