Changeset 91011 in vbox

Timestamp:

Aug 30, 2021 7:34:32 PM (4 years ago)

Author:

vboxsync

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

146651

Message:

3D/VMSVGA: Workaround for wrong sampler type declaration SVGA3DSAMP_UNKNOWN (usually happens with Linux guest having Mesa 21), bugref:10091

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-hlp.cpp (modified) (5 diffs)
• DevVGA-SVGA3d-internal.h (modified) (1 diff)

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

@@ -39 +39 @@
     /** Version token. */
     SVGA3dShaderVersion version;
+
+    SVGA3dShaderOpCodeType currentOpcode;
+    union
+    {
+        SVGA3DOpDclArgs *pDclArgs;
+    } u;
 } VMSVGA3DSHADERPARSECONTEXT;
 
@@ -159 +165 @@
     Log3(("Dest: type %d, r0 %d, shfScale %d, dstMod %d, mask 0x%x, r1 %d, relAddr %d, num %d\n",
         regType, dest.reserved0, dest.shfScale, dest.dstMod, dest.mask, dest.reserved1, dest.relAddr, dest.num));
+
+    if (pCtx->currentOpcode == SVGA3DOP_DCL && regType == SVGA3DREG_SAMPLER)
+    {
+        if (pCtx->u.pDclArgs->type == SVGA3DSAMP_UNKNOWN)
+        {
+            Log3(("Replacing SVGA3DSAMP_UNKNOWN with SVGA3DSAMP_2D\n"));
+            pCtx->u.pDclArgs->type = SVGA3DSAMP_2D;
+        }
+    }
 
     return vmsvga3dShaderParseRegOffset(pCtx, false, regType, dest.num);
@@ -300 +315 @@
  * https://docs.microsoft.com/en-us/windows-hardware/drivers/display/shader-code-format
  */
-int vmsvga3dShaderParse(SVGA3dShaderType type, uint32_t cbShaderData, uint32_t const* pShaderData)
-{
-    uint32_t const* paTokensStart = (uint32_t*)pShaderData;
+int vmsvga3dShaderParse(SVGA3dShaderType type, uint32_t cbShaderData, uint32_t* pShaderData)
+{
+    uint32_t *paTokensStart = (uint32_t*)pShaderData;
     uint32_t const cTokens = cbShaderData / sizeof(uint32_t);
 
@@ -341 +356 @@
 
     /* Scan the tokens. Immediately return an error code on any unexpected data. */
-    uint32_t const* paTokensEnd = &paTokensStart[cTokens];
-    uint32_t const* pToken = &paTokensStart[1]; /* Skip the version token. */
+    uint32_t *paTokensEnd = &paTokensStart[cTokens];
+    uint32_t *pToken = &paTokensStart[1]; /* Skip the version token. */
     bool  bEndTokenFound = false;
     while (pToken < paTokensEnd)
@@ -366 +381 @@
         }
 
+        ctx.currentOpcode = (SVGA3dShaderOpCodeType)token.op;
+
         /* If this instrution is in the aOps table. */
         if (token.op <= SVGA3DOP_BREAKP)
         {
             VMSVGA3DSHADERPARSEOP const* pOp = &aOps[token.op];
+
+            if (ctx.currentOpcode == SVGA3DOP_DCL)
+                ctx.u.pDclArgs = (SVGA3DOpDclArgs *)&pToken[1];
 
             /* cInstLen can be greater than pOp->Length.

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

@@ -1408 +1408 @@
 #endif
 
-int vmsvga3dShaderParse(SVGA3dShaderType type, uint32_t cbShaderData, uint32_t const *pShaderData);
+int vmsvga3dShaderParse(SVGA3dShaderType type, uint32_t cbShaderData, uint32_t *pShaderData);
 void vmsvga3dShaderLogRel(char const *pszMsg, SVGA3dShaderType type, uint32_t cbShaderData, uint32_t const *pShaderData);