From 140a2c1017cf3c60f1f3f58b0f41706868d2b67e Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Sat, 3 Aug 2019 19:08:22 +0200 Subject: [PATCH] Revert "[d3d11] Return error when mapping an already mapped image" This reverts commit 1cc531eaf8002cef3e9707cdc3398f45909e38d2. Even though an FFXIV apitrace clearly indicates that mapping an already mapped subresource returns E_OUTOFMEMORY in that game, this doesn't always seem to be correct behaviour. Fixes #1148, #1149. --- src/d3d11/d3d11_context_imm.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/d3d11/d3d11_context_imm.cpp b/src/d3d11/d3d11_context_imm.cpp index 3e8ae0d18..a7d186d98 100644 --- a/src/d3d11/d3d11_context_imm.cpp +++ b/src/d3d11/d3d11_context_imm.cpp @@ -340,9 +340,6 @@ namespace dxvk { if (unlikely(Subresource >= pResource->CountSubresources())) return E_INVALIDARG; - if (unlikely(pResource->GetMapType(Subresource) != D3D11_MAP(~0u))) - return E_OUTOFMEMORY; - pResource->SetMapType(Subresource, MapType); VkFormat packedFormat = m_parent->LookupPackedFormat(