Changeset 53780 in vbox

Timestamp:

Jan 13, 2015 11:16:52 AM (10 years ago)

Author:

vboxsync

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

97587

Message:

logging adjustments

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.cpp (modified) (1 diff)
• DevVGA-SVGA3d-win.cpp (modified) (3 diffs)

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

@@ -320 +320 @@
 
     default:
-        if (    pThis->svga.u32IndexReg >= SVGA_SCRATCH_BASE
-            &&  pThis->svga.u32IndexReg < SVGA_SCRATCH_BASE + pThis->svga.cScratchRegion)
-        {
+        if (pThis->svga.u32IndexReg - (uint32_t)SVGA_SCRATCH_BASE < pThis->svga.cScratchRegion)
             return "SVGA_SCRATCH_BASE reg";
-        }
+        if (pThis->svga.u32IndexReg - (uint32_t)SVGA_PALETTE_BASE < (uint32_t)SVGA_NUM_PALETTE_REGS)
+            return "SVGA_PALETTE_BASE reg";
         return "UNKNOWN";
     }

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

@@ -2305 +2305 @@
 }
 
-int vmsvga3dSurfaceDMA(PVGASTATE pThis, SVGA3dGuestImage guest, SVGA3dSurfaceImageId host, SVGA3dTransferType transfer, uint32_t cCopyBoxes, SVGA3dCopyBox *pBoxes)
+int vmsvga3dSurfaceDMA(PVGASTATE pThis, SVGA3dGuestImage guest, SVGA3dSurfaceImageId host, SVGA3dTransferType transfer,
+                       uint32_t cCopyBoxes, SVGA3dCopyBox *pBoxes)
 {
     PVMSVGA3DSTATE          pState = (PVMSVGA3DSTATE)pThis->svga.p3dState;
@@ -2559 +2560 @@
                 AssertReturn(uDestOffset + pBoxes[i].w * pSurface->cbBlock + (pBoxes[i].h - 1) * pSurface->pMipmapLevels[host.mipmap].cbSurfacePitch <= pSurface->pMipmapLevels[host.mipmap].cbSurface, VERR_INTERNAL_ERROR);
 
-                /* @todo lock only as much as we really need */
+                /** @todo lock only as much as we really need */
                 if (fVertex)
                     hr = pSurface->u.pVertexBuffer->Lock(0, 0, (void **)&pData, dwFlags);
@@ -6295 +6296 @@
 
     LogRel(("\n"));
-    LogRel(("  PixelShaderVersion:  %#x (%u.%u)\n",
-            pCaps->PixelShaderVersion,  RT_BYTE2(pCaps->PixelShaderVersion),  RT_BYTE1(pCaps->PixelShaderVersion)));
-    LogRel(("  VertexShaderVersion: %#x (%u.%u)\n",
-            pCaps->VertexShaderVersion, RT_BYTE2(pCaps->VertexShaderVersion), RT_BYTE1(pCaps->VertexShaderVersion)));
-
+    LogRel(("PixelShaderVersion:  %#x (%u.%u)\n", pCaps->PixelShaderVersion,
+            D3DSHADER_VERSION_MAJOR(pCaps->PixelShaderVersion), D3DSHADER_VERSION_MINOR(pCaps->PixelShaderVersion)));
+    LogRel(("VertexShaderVersion: %#x (%u.%u)\n", pCaps->VertexShaderVersion,
+            D3DSHADER_VERSION_MAJOR(pCaps->VertexShaderVersion), D3DSHADER_VERSION_MINOR(pCaps->VertexShaderVersion)));
+
+    LogRel(("\n"));
     RTLogRelSetBuffering(fBufferingSaved);
 }