From 4fb7acc64e29b7e82436817ac04d8f02a09ea255 Mon Sep 17 00:00:00 2001
From: Robin Kertels <robin.kertels@gmail.com>
Date: Sat, 5 Nov 2022 17:57:57 +0100
Subject: [PATCH] [d3d9] Implement converter for W11V11U10

---
 src/d3d9/d3d9_format.cpp                     | 10 +++++
 src/d3d9/d3d9_format.h                       |  2 +
 src/d3d9/d3d9_format_helpers.cpp             |  6 +++
 src/d3d9/meson.build                         |  1 +
 src/d3d9/shaders/d3d9_convert_w11v11u10.comp | 43 ++++++++++++++++++++
 5 files changed, 62 insertions(+)
 create mode 100644 src/d3d9/shaders/d3d9_convert_w11v11u10.comp

diff --git a/src/d3d9/d3d9_format.cpp b/src/d3d9/d3d9_format.cpp
index 90ebfd93e..4fe96bb45 100644
--- a/src/d3d9/d3d9_format.cpp
+++ b/src/d3d9/d3d9_format.cpp
@@ -168,6 +168,16 @@ namespace dxvk {
         // Convert -> float (this is a mixed snorm and unorm type)
           VK_FORMAT_R16G16B16A16_SFLOAT } };
 
+      case D3D9Format::W11V11U10: return {
+        VK_FORMAT_B10G11R11_UFLOAT_PACK32,
+        VK_FORMAT_UNDEFINED,
+        VK_IMAGE_ASPECT_COLOR_BIT,
+        { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G,
+          VK_COMPONENT_SWIZZLE_B, VK_COMPONENT_SWIZZLE_ONE },
+        { D3D9ConversionFormat_W11V11U10, 1u,
+        // can't use B10G11R11 bc this is a snorm type
+          VK_FORMAT_R16G16B16A16_SNORM } };
+
       case D3D9Format::UYVY: return {
         VK_FORMAT_B8G8R8A8_UNORM,
         VK_FORMAT_UNDEFINED,
diff --git a/src/d3d9/d3d9_format.h b/src/d3d9/d3d9_format.h
index 23acd1f51..b09b9d469 100644
--- a/src/d3d9/d3d9_format.h
+++ b/src/d3d9/d3d9_format.h
@@ -40,6 +40,7 @@ namespace dxvk {
     X8L8V8U8 = 62,
     Q8W8V8U8 = 63,
     V16U16 = 64,
+    W11V11U10 = 65,
     A2W10V10U10 = 67,
     UYVY = MAKEFOURCC('U', 'Y', 'V', 'Y'),
     R8G8_B8G8 = MAKEFOURCC('R', 'G', 'B', 'G'),
@@ -134,6 +135,7 @@ namespace dxvk {
     D3D9ConversionFormat_L6V5U5,
     D3D9ConversionFormat_X8L8V8U8,
     D3D9ConversionFormat_A2W10V10U10,
+    D3D9ConversionFormat_W11V11U10,
     D3D9ConversionFormat_NV12,
     D3D9ConversionFormat_YV12,
     D3D9ConversionFormat_Count
diff --git a/src/d3d9/d3d9_format_helpers.cpp b/src/d3d9/d3d9_format_helpers.cpp
index 7d37bb598..f12592dac 100644
--- a/src/d3d9/d3d9_format_helpers.cpp
+++ b/src/d3d9/d3d9_format_helpers.cpp
@@ -4,6 +4,7 @@
 #include <d3d9_convert_l6v5u5.h>
 #include <d3d9_convert_x8l8v8u8.h>
 #include <d3d9_convert_a2w10v10u10.h>
+#include <d3d9_convert_w11v11u10.h>
 #include <d3d9_convert_nv12.h>
 #include <d3d9_convert_yv12.h>
 
@@ -57,6 +58,10 @@ namespace dxvk {
         ConvertGenericFormat(conversionFormat, dstImage, dstSubresource, srcSlice, VK_FORMAT_R32_UINT, 0, { 1u, 1u });
         break;
 
+      case D3D9ConversionFormat_W11V11U10:
+        ConvertGenericFormat(conversionFormat, dstImage, dstSubresource, srcSlice, VK_FORMAT_R32_UINT, 0, { 1u, 1u });
+        break;
+
       default:
         Logger::warn("Unimplemented format conversion");
     }
@@ -113,6 +118,7 @@ namespace dxvk {
     m_shaders[D3D9ConversionFormat_L6V5U5] = InitShader(d3d9_convert_l6v5u5);
     m_shaders[D3D9ConversionFormat_X8L8V8U8] = InitShader(d3d9_convert_x8l8v8u8);
     m_shaders[D3D9ConversionFormat_A2W10V10U10] = InitShader(d3d9_convert_a2w10v10u10);
+    m_shaders[D3D9ConversionFormat_W11V11U10] = InitShader(d3d9_convert_w11v11u10);
     m_shaders[D3D9ConversionFormat_NV12] = InitShader(d3d9_convert_nv12);
     m_shaders[D3D9ConversionFormat_YV12] = InitShader(d3d9_convert_yv12);
   }
diff --git a/src/d3d9/meson.build b/src/d3d9/meson.build
index 3d121e2cc..9e27c6e83 100644
--- a/src/d3d9/meson.build
+++ b/src/d3d9/meson.build
@@ -5,6 +5,7 @@ d3d9_shaders = files([
   'shaders/d3d9_convert_l6v5u5.comp',
   'shaders/d3d9_convert_x8l8v8u8.comp',
   'shaders/d3d9_convert_a2w10v10u10.comp',
+  'shaders/d3d9_convert_w11v11u10.comp',
   'shaders/d3d9_convert_nv12.comp',
   'shaders/d3d9_convert_yv12.comp'
 ])
diff --git a/src/d3d9/shaders/d3d9_convert_w11v11u10.comp b/src/d3d9/shaders/d3d9_convert_w11v11u10.comp
new file mode 100644
index 000000000..4c822546b
--- /dev/null
+++ b/src/d3d9/shaders/d3d9_convert_w11v11u10.comp
@@ -0,0 +1,43 @@
+#version 450
+#extension GL_GOOGLE_include_directive : enable
+
+#include "d3d9_convert_common.h"
+
+layout(
+  local_size_x = 8,
+  local_size_y = 8,
+  local_size_z = 1) in;
+
+layout(binding = 0)
+writeonly uniform image2D dst;
+
+layout(binding = 1) uniform usamplerBuffer src;
+
+layout(push_constant)
+uniform u_info_t {
+  uvec2 extent;
+} u_info;
+
+void main() {
+  ivec3 thread_id = ivec3(gl_GlobalInvocationID);
+
+  if (all(lessThan(thread_id.xy, u_info.extent))) {
+    uint offset = thread_id.x
+                + thread_id.y * u_info.extent.x;
+
+    uint value = texelFetch(src, int(offset)).r;
+
+    // Sign-extend magic!
+    int  u10 = bitfieldExtract(int (value), 0,  10);
+    int  v11 = bitfieldExtract(int (value), 10, 11);
+    int  w11 = bitfieldExtract(int (value), 21, 11);
+
+    vec4 color = vec4(
+      snormalize(u10, 10),
+      snormalize(v11, 10),
+      snormalize(w11, 10),
+      1.0);
+
+    imageStore(dst, thread_id.xy, color);
+  }
+}