From a91afc3a2fe7159ad5c7340a7ab6947e9392bfb9 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Wed, 30 Oct 2024 00:32:20 +0100 Subject: [PATCH] [d3d11] Do not touch row/depth pitch on failed map Fixes a wine test. --- src/d3d11/d3d11_context_imm.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/d3d11/d3d11_context_imm.cpp b/src/d3d11/d3d11_context_imm.cpp index 7681ac712..5a929e01b 100644 --- a/src/d3d11/d3d11_context_imm.cpp +++ b/src/d3d11/d3d11_context_imm.cpp @@ -319,7 +319,7 @@ namespace dxvk { if (unlikely(pResource->GetMapMode() == D3D11_COMMON_BUFFER_MAP_MODE_NONE)) { Logger::err("D3D11: Cannot map a device-local buffer"); - *pMappedResource = D3D11_MAPPED_SUBRESOURCE(); + pMappedResource->pData = nullptr; return E_INVALIDARG; } @@ -392,7 +392,7 @@ namespace dxvk { return S_OK; } else { if (!WaitForResource(*buffer, sequenceNumber, MapType, MapFlags)) { - *pMappedResource = D3D11_MAPPED_SUBRESOURCE(); + pMappedResource->pData = nullptr; return DXGI_ERROR_WAS_STILL_DRAWING; } @@ -417,7 +417,7 @@ namespace dxvk { auto mapMode = pResource->GetMapMode(); if (pMappedResource) - *pMappedResource = D3D11_MAPPED_SUBRESOURCE(); + pMappedResource->pData = nullptr; if (unlikely(mapMode == D3D11_COMMON_TEXTURE_MAP_MODE_NONE)) { Logger::err("D3D11: Cannot map a device-local image");