Changeset 105566 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 1, 2024 1:57:57 PM (7 months ago)

Author:

vboxsync

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

164237

Message:

WDDM: fixed wrong assignment in vgpu10SetBlendState; logging

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx

Files:

• VBoxDX.h (modified) (1 diff)
• VBoxDXCmd.cpp (modified) (1 diff)
• VBoxDXDDI.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx/VBoxDX.h

@@ -53 +53 @@
 #define DEBUG_BREAKPOINT_TEST() do { } while (0)
 #endif
+
+/**@def FLOAT_FMT_STR
+ * Format string bits to go with FLOAT_FMT_ARGS. */
+#define FLOAT_FMT_STR                  "%s%u.%06u"
+/** @def FLOAT_FMT_ARGS
+ * Format arguments for a float value, corresponding to FLOAT_FMT_STR.
+ * @param   r       The floating point value to format.  */
+#define FLOAT_FMT_ARGS(r)              (r) >= 0.0f ? "" : "-", (unsigned)RT_ABS(r) \
+                                       , (unsigned)(RT_ABS((r) - (float)(unsigned)(r)) * 1000000.0f)
 
 typedef struct VBOXDXADAPTER

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx/VBoxDXCmd.cpp

@@ -326 +326 @@
     SVGA3dCmdDXSetBlendState *cmd = (SVGA3dCmdDXSetBlendState *)pvCmd;
     SET_CMD_FIELD(blendId);
-    memcpy(cmd->blendFactor, blendFactor, sizeof(blendFactor));
+    SET_CMD_FIELD(blendFactor[0]);
+    SET_CMD_FIELD(blendFactor[1]);
+    SET_CMD_FIELD(blendFactor[2]);
+    SET_CMD_FIELD(blendFactor[3]);
     SET_CMD_FIELD(sampleMask);
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx/VBoxDXDDI.cpp

@@ -788 +788 @@
     PVBOXDX_DEVICE pDevice = (PVBOXDX_DEVICE)hDevice.pDrvPrivate;
     PVBOXDX_BLENDSTATE pBlendState = (PVBOXDX_BLENDSTATE)hBlendState.pDrvPrivate;
-    LogFlowFunc(("pDevice 0x%p, pBlendState 0x%p, SampleMask 0x%x", pDevice, pBlendState, SampleMask));
+    LogFlowFunc(("pDevice 0x%p, pBlendState 0x%p, BlendFactor (" FLOAT_FMT_STR ", " FLOAT_FMT_STR ", " FLOAT_FMT_STR ", " FLOAT_FMT_STR "), SampleMask 0x%x",
+                 pDevice, pBlendState, FLOAT_FMT_ARGS(BlendFactor[0]), FLOAT_FMT_ARGS(BlendFactor[1]), FLOAT_FMT_ARGS(BlendFactor[2]), FLOAT_FMT_ARGS(BlendFactor[3]), SampleMask));
+
+#ifdef LOG_ENABLED
+    if (pBlendState)
+    {
+        LogFlowFunc(("[%u] ATCE %d, IBE %d, RT: b %d, lo %d, src %d, dest %d. op %d, asrc %d, adest %d. aop %d, lo %d, m %x\n",
+                     pBlendState->uBlendId, pBlendState->BlendDesc.AlphaToCoverageEnable, pBlendState->BlendDesc.IndependentBlendEnable,
+                     pBlendState->BlendDesc.RenderTarget[0].BlendEnable,
+                     pBlendState->BlendDesc.RenderTarget[0].LogicOpEnable,
+                     pBlendState->BlendDesc.RenderTarget[0].SrcBlend,
+                     pBlendState->BlendDesc.RenderTarget[0].DestBlend,
+                     pBlendState->BlendDesc.RenderTarget[0].BlendOp,
+                     pBlendState->BlendDesc.RenderTarget[0].SrcBlendAlpha,
+                     pBlendState->BlendDesc.RenderTarget[0].DestBlendAlpha,
+                     pBlendState->BlendDesc.RenderTarget[0].BlendOpAlpha,
+                     pBlendState->BlendDesc.RenderTarget[0].LogicOp,
+                     pBlendState->BlendDesc.RenderTarget[0].RenderTargetWriteMask));
+    }
+#endif
+
 
     vboxDXSetBlendState(pDevice, pBlendState, BlendFactor, SampleMask);