Changeset 94227 in vbox

Timestamp:

Mar 14, 2022 3:02:49 PM (3 years ago)

Author:

vboxsync

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

150483

Message:

Devices/Graphics: a fix for piglit; map fix for compressed textures; remove obsolete assert: bugref:9830

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win-dx.cpp (modified) (3 diffs)

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

@@ -1368 +1368 @@
 
 
+static D3D11_FILL_MODE dxFillMode(uint8_t svgaFillMode)
+{
+    if (svgaFillMode == SVGA3D_FILLMODE_POINT)
+        return D3D11_FILL_WIREFRAME;
+    return (D3D11_FILL_MODE)svgaFillMode;
+}
+
+
 static HRESULT dxRasterizerStateCreate(DXDEVICE *pDevice, SVGACOTableDXRasterizerStateEntry const *pEntry, ID3D11RasterizerState **pp)
 {
     D3D11_RASTERIZER_DESC desc;
-    desc.FillMode              = (D3D11_FILL_MODE)pEntry->fillMode;
+    desc.FillMode              = dxFillMode(pEntry->fillMode);
     desc.CullMode              = (D3D11_CULL_MODE)pEntry->cullMode;
     desc.FrontCounterClockwise = pEntry->frontCounterClockwise;
@@ -3320 +3328 @@
             pMap->cbDepthPitch = mappedResource.DepthPitch;
             pMap->pvData       = (uint8_t *)mappedResource.pData
-                               + pMap->box.x * pMap->cbPixel
-                               + pMap->box.y * pMap->cbRowPitch
+                               + (pMap->box.x / pSurface->cxBlock) * pMap->cbPixel
+                               + (pMap->box.y / pSurface->cyBlock) * pMap->cbRowPitch
                                + pMap->box.z * pMap->cbDepthPitch;
         }
@@ -4866 +4874 @@
     {
         /** @todo This is generic code and should be in DevVGA-SVGA3d.cpp for backends which support Map/Unmap. */
-        AssertReturn(uHostFace == 0 && uHostMipmap == 0, VERR_INVALID_PARAMETER);
-
         uint32_t const u32GuestBlockX = pBox->srcx / pSurface->cxBlock;
         uint32_t const u32GuestBlockY = pBox->srcy / pSurface->cyBlock;