From e4e82007b1fb612561ebcca6073812c281aaae89 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Mon, 3 Jun 2019 15:30:04 +0200
Subject: [PATCH] [d3d11] Fix inconsistencies in Map/Unmap on
 immediate/deferred contexts

Should save a few CPU cycles, and also fixes incorrect behaviour when an
application passes null pointers to Map on a deferred context.
---
 src/d3d11/d3d11_context_def.cpp | 40 ++++++++++++++++-----------------
 src/d3d11/d3d11_context_imm.cpp |  7 ++----
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/d3d11/d3d11_context_def.cpp b/src/d3d11/d3d11_context_def.cpp
index 24f75a41..f4301181 100644
--- a/src/d3d11/d3d11_context_def.cpp
+++ b/src/d3d11/d3d11_context_def.cpp
@@ -84,15 +84,12 @@ namespace dxvk {
           D3D11_MAPPED_SUBRESOURCE*   pMappedResource) {
     D3D10DeviceLock lock = LockContext();
 
+    if (unlikely(!pResource || !pMappedResource))
+      return E_INVALIDARG;
+    
     D3D11_RESOURCE_DIMENSION resourceDim = D3D11_RESOURCE_DIMENSION_UNKNOWN;
     pResource->GetType(&resourceDim);
     
-    if (pMappedResource != nullptr) {
-      pMappedResource->pData      = nullptr;
-      pMappedResource->RowPitch   = 0;
-      pMappedResource->DepthPitch = 0;
-    }
-    
     if (MapType == D3D11_MAP_WRITE_DISCARD) {
       D3D11DeferredContextMapEntry entry;
       
@@ -100,8 +97,10 @@ namespace dxvk {
         ? MapBuffer(pResource,              MapType, MapFlags, &entry)
         : MapImage (pResource, Subresource, MapType, MapFlags, &entry);
       
-      if (FAILED(status))
+      if (unlikely(FAILED(status))) {
+        *pMappedResource = D3D11_MAPPED_SUBRESOURCE();
         return status;
+      }
       
       // Adding a new map entry actually overrides the
       // old one in practice because the lookup function
@@ -118,8 +117,10 @@ namespace dxvk {
       // before it can be mapped with D3D11_MAP_WRITE_NO_OVERWRITE.
       auto entry = FindMapEntry(pResource, Subresource);
       
-      if (entry == m_mappedResources.rend())
+      if (unlikely(entry == m_mappedResources.rend())) {
+        *pMappedResource = D3D11_MAPPED_SUBRESOURCE();
         return E_INVALIDARG;
+      }
       
       // Return same memory region as earlier
       entry->MapType = D3D11_MAP_WRITE_NO_OVERWRITE;
@@ -130,6 +131,7 @@ namespace dxvk {
       return S_OK;
     } else {
       // Not allowed on deferred contexts
+      *pMappedResource = D3D11_MAPPED_SUBRESOURCE();
       return E_INVALIDARG;
     }
   }
@@ -140,21 +142,19 @@ namespace dxvk {
           UINT                        Subresource) {
     D3D10DeviceLock lock = LockContext();
 
-    D3D11_RESOURCE_DIMENSION resourceDim = D3D11_RESOURCE_DIMENSION_UNKNOWN;
-    pResource->GetType(&resourceDim);
-    
     auto entry = FindMapEntry(pResource, Subresource);
-    
-    if (entry == m_mappedResources.rend()) {
+    if (unlikely(entry == m_mappedResources.rend())) {
       Logger::err("D3D11DeferredContext::Unmap: Subresource not mapped");
       return;
     }
     
     if (entry->MapType == D3D11_MAP_WRITE_DISCARD) {
-      if (resourceDim == D3D11_RESOURCE_DIMENSION_BUFFER)
-        UnmapBuffer(pResource, &(*entry));
-      else
-        UnmapImage(pResource, Subresource, &(*entry));
+      D3D11_RESOURCE_DIMENSION resourceDim = D3D11_RESOURCE_DIMENSION_UNKNOWN;
+      pResource->GetType(&resourceDim);
+      
+      (resourceDim == D3D11_RESOURCE_DIMENSION_BUFFER)
+        ? UnmapBuffer(pResource,              &(*entry))
+        : UnmapImage (pResource, Subresource, &(*entry));
     }
   }
   
@@ -184,7 +184,7 @@ namespace dxvk {
     pMapEntry->RowPitch     = pBuffer->Desc()->ByteWidth;
     pMapEntry->DepthPitch   = pBuffer->Desc()->ByteWidth;
     
-    if (pBuffer->Desc()->Usage == D3D11_USAGE_DYNAMIC && m_csFlags.test(DxvkCsChunkFlag::SingleUse)) {
+    if (likely(pBuffer->Desc()->Usage == D3D11_USAGE_DYNAMIC && m_csFlags.test(DxvkCsChunkFlag::SingleUse))) {
       // For resources that cannot be written by the GPU,
       // we may write to the buffer resource directly and
       // just swap in the buffer slice as needed.
@@ -210,7 +210,7 @@ namespace dxvk {
     const D3D11CommonTexture* pTexture = GetCommonTexture(pResource);
     const Rc<DxvkImage> image = pTexture->GetImage();
     
-    if (pTexture->GetMapMode() == D3D11_COMMON_TEXTURE_MAP_MODE_NONE) {
+    if (unlikely(pTexture->GetMapMode() == D3D11_COMMON_TEXTURE_MAP_MODE_NONE)) {
       Logger::err("D3D11: Cannot map a device-local image");
       return E_INVALIDARG;
     }
@@ -250,7 +250,7 @@ namespace dxvk {
     const D3D11DeferredContextMapEntry* pMapEntry) {
     D3D11Buffer* pBuffer = static_cast<D3D11Buffer*>(pResource);
     
-    if (pBuffer->Desc()->Usage == D3D11_USAGE_DYNAMIC && m_csFlags.test(DxvkCsChunkFlag::SingleUse)) {
+    if (likely(pBuffer->Desc()->Usage == D3D11_USAGE_DYNAMIC && m_csFlags.test(DxvkCsChunkFlag::SingleUse))) {
       EmitCs([
         cDstBuffer = pBuffer->GetBuffer(),
         cPhysSlice = pMapEntry->BufferSlice
diff --git a/src/d3d11/d3d11_context_imm.cpp b/src/d3d11/d3d11_context_imm.cpp
index e3560aa4..98549e53 100644
--- a/src/d3d11/d3d11_context_imm.cpp
+++ b/src/d3d11/d3d11_context_imm.cpp
@@ -196,11 +196,8 @@ namespace dxvk {
         pMappedResource);
     }
 
-    if (unlikely(FAILED(hr))) {
-      pMappedResource->pData      = nullptr;
-      pMappedResource->RowPitch   = 0;
-      pMappedResource->DepthPitch = 0;
-    }
+    if (unlikely(FAILED(hr)))
+      *pMappedResource = D3D11_MAPPED_SUBRESOURCE();
 
     return hr;
   }