From ee28f145dc2184cdcf699b5b5c69e611ad808e15 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Sat, 12 Mar 2022 14:54:06 +0100
Subject: [PATCH] [d3d11] Explicitly handle R32-compatible UAV formats

---
 src/d3d11/d3d11_texture.cpp | 29 +++++++++++++++++++++--------
 src/d3d11/d3d11_texture.h   |  3 +++
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/d3d11/d3d11_texture.cpp b/src/d3d11/d3d11_texture.cpp
index 5277ca22..e5a542d8 100644
--- a/src/d3d11/d3d11_texture.cpp
+++ b/src/d3d11/d3d11_texture.cpp
@@ -69,8 +69,15 @@ namespace dxvk {
 
       if (formatBase.Format != formatInfo.Format
        && formatBase.Format != VK_FORMAT_UNDEFINED) {
-        formatFamily.Add(formatBase.Format);
         formatFamily.Add(formatInfo.Format);
+        formatFamily.Add(formatBase.Format);
+      }
+
+      if (IsR32UavCompatibleFormat(m_desc.Format)) {
+        formatFamily.Add(formatInfo.Format);
+        formatFamily.Add(VK_FORMAT_R32_SFLOAT);
+        formatFamily.Add(VK_FORMAT_R32_UINT);
+        formatFamily.Add(VK_FORMAT_R32_SINT);
       }
     }
 
@@ -79,19 +86,14 @@ namespace dxvk {
     // be reinterpreted in Vulkan, so we'll ignore those.
     auto formatProperties = imageFormatInfo(formatInfo.Format);
     
-    bool isTypeless = formatInfo.Aspect == 0;
     bool isMutable = formatFamily.FormatCount > 1;
     bool isMultiPlane = (formatProperties->aspectMask & VK_IMAGE_ASPECT_PLANE_0_BIT) != 0;
     bool isColorFormat = (formatProperties->aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) != 0;
 
     if (isMutable && (isColorFormat || isMultiPlane)) {
       imageInfo.flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT;
-
-      // Typeless UAV images have relaxed reinterpretation rules
-      if (!isTypeless || !(m_desc.BindFlags & D3D11_BIND_UNORDERED_ACCESS)) {
-        imageInfo.viewFormatCount = formatFamily.FormatCount;
-        imageInfo.viewFormats     = formatFamily.Formats;
-      }
+      imageInfo.viewFormatCount = formatFamily.FormatCount;
+      imageInfo.viewFormats     = formatFamily.Formats;
     }
 
     // Adjust image flags based on the corresponding D3D flags
@@ -644,6 +646,17 @@ namespace dxvk {
   }
   
   
+  BOOL D3D11CommonTexture::IsR32UavCompatibleFormat(
+          DXGI_FORMAT           Format) {
+    return Format == DXGI_FORMAT_R8G8B8A8_TYPELESS
+        || Format == DXGI_FORMAT_B8G8R8A8_TYPELESS
+        || Format == DXGI_FORMAT_B8G8R8X8_TYPELESS
+        || Format == DXGI_FORMAT_R10G10B10A2_TYPELESS
+        || Format == DXGI_FORMAT_R16G16_TYPELESS
+        || Format == DXGI_FORMAT_R32_TYPELESS;
+  }
+
+
   D3D11CommonTexture::MappedBuffer D3D11CommonTexture::CreateMappedBuffer(UINT MipLevel) const {
     const DxvkFormatInfo* formatInfo = imageFormatInfo(
       m_device->LookupPackedFormat(m_desc.Format, GetFormatMode()).Format);
diff --git a/src/d3d11/d3d11_texture.h b/src/d3d11/d3d11_texture.h
index e12e35d1..c3e4e3c9 100644
--- a/src/d3d11/d3d11_texture.h
+++ b/src/d3d11/d3d11_texture.h
@@ -422,6 +422,9 @@ namespace dxvk {
 
     void ExportImageInfo();
     
+    static BOOL IsR32UavCompatibleFormat(
+            DXGI_FORMAT           Format);
+
     static VkImageType GetImageTypeFromResourceDim(
             D3D11_RESOURCE_DIMENSION  Dimension);