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

Timestamp:

Nov 30, 2022 6:27:08 PM (2 years ago)

Author:

vboxsync

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

154783

Message:

Devices/Graphics: corrected an assert; logging. bugref:9830

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-dx-dx11.cpp (modified) (3 diffs)
• DevVGA-SVGA3d-dx-shader.cpp (modified) (2 diffs)

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

@@ -5683 +5683 @@
 
             Assert(pPriorSignatureEntry->registerIndex == pSignatureEntry->registerIndex);
-            Assert(pPriorSignatureEntry->mask == pSignatureEntry->mask);
+            Assert((pPriorSignatureEntry->mask & pSignatureEntry->mask) == pSignatureEntry->mask);
             RT_NOREF(pPriorSignatureEntry);
 
@@ -6094 +6094 @@
                 }
 
-                LogFunc(("srv[%d][%d] sid = %u, srvid = %u\n", idxShaderState, idxSR, sid, shaderResourceViewId));
+                LogFunc(("srv[%d][%d] sid = %u, srvid = %u, format = %s(%d)\n", idxShaderState, idxSR, sid, shaderResourceViewId, vmsvgaLookupEnum((int)pSRViewEntry->format, &g_SVGA3dSurfaceFormat2String), pSRViewEntry->format));
 
 #ifdef DUMP_BITMAPS
@@ -6221 +6221 @@
             }
 
-            LogFunc(("rtv sid = %u, rtvid = %u\n", pRTViewEntry->sid, viewId));
+            LogFunc(("rtv sid = %u, rtvid = %u, format = %s(%d)\n", pRTViewEntry->sid, viewId, vmsvgaLookupEnum((int)pRTViewEntry->format, &g_SVGA3dSurfaceFormat2String), pRTViewEntry->format));
         }
     }

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

@@ -746 +746 @@
 
 
+static const char *dxbcExtendedOperandTypeToString(uint32_t value)
+{
+    VGPU10_EXTENDED_OPERAND_TYPE enm = (VGPU10_EXTENDED_OPERAND_TYPE)value;
+    switch (enm)
+    {
+        SVGA_CASE_ID2STR(VGPU10_EXTENDED_OPERAND_EMPTY);
+        SVGA_CASE_ID2STR(VGPU10_EXTENDED_OPERAND_MODIFIER);
+    }
+    return NULL;
+}
+
+
+static const char *dxbcOperandModifierToString(uint32_t value)
+{
+    VGPU10_OPERAND_MODIFIER enm = (VGPU10_OPERAND_MODIFIER)value;
+    switch (enm)
+    {
+        SVGA_CASE_ID2STR(VGPU10_OPERAND_MODIFIER_NONE);
+        SVGA_CASE_ID2STR(VGPU10_OPERAND_MODIFIER_NEG);
+        SVGA_CASE_ID2STR(VGPU10_OPERAND_MODIFIER_ABS);
+        SVGA_CASE_ID2STR(VGPU10_OPERAND_MODIFIER_ABSNEG);
+    }
+    return NULL;
+}
+
+
 static const char *dxbcOperandNumComponentsToString(uint32_t value)
 {
@@ -1415 +1441 @@
         VGPU10OperandToken1 operand1;
         operand1.value = dxbcTokenReaderRead32(r);
+
+        Log6(("      %s(%d)  %s(%d)\n",
+              dxbcExtendedOperandTypeToString(operand1.extendedOperandType), operand1.extendedOperandType,
+              dxbcOperandModifierToString(operand1.operandModifier), operand1.operandModifier));
     }