From 18035820dea6c3e6a2ee16f48e20f32d10f71c96 Mon Sep 17 00:00:00 2001
From: WinterSnowfall <WinterSnowfall@users.noreply.github.com>
Date: Sun, 23 Jun 2024 03:27:04 +0300
Subject: [PATCH] [d3d9] Remove vestigial D32 support

---
 dxvk.conf                  | 9 ---------
 src/d3d9/d3d9_format.cpp   | 4 ----
 src/d3d9/d3d9_format.h     | 1 -
 src/d3d9/d3d9_options.cpp  | 1 -
 src/d3d9/d3d9_options.h    | 3 ---
 src/util/config/config.cpp | 4 ----
 6 files changed, 22 deletions(-)

diff --git a/dxvk.conf b/dxvk.conf
index 10c95d442..5d552adf8 100644
--- a/dxvk.conf
+++ b/dxvk.conf
@@ -570,15 +570,6 @@
 
 # d3d9.supportX4R4G4B4 = True
 
-# Support D32
-#
-# Support the D32 format.
-#
-# Supported values:
-# - True/False
-
-# d3d9.supportD32 = True
-
 # Disable A8 as a Render Target
 #
 # Disable support for A8 format render targets
diff --git a/src/d3d9/d3d9_format.cpp b/src/d3d9/d3d9_format.cpp
index 87431a874..5ba1985ca 100644
--- a/src/d3d9/d3d9_format.cpp
+++ b/src/d3d9/d3d9_format.cpp
@@ -440,7 +440,6 @@ namespace dxvk {
     const D3D9Options&     options) {
     m_dfSupport = options.supportDFFormats;
     m_x4r4g4b4Support = options.supportX4R4G4B4;
-    m_d32supportFinal = options.supportD32;
 
     // AMD do not support 24-bit depth buffers on Vulkan,
     // so we have to fall back to a 32-bit depth format.
@@ -478,9 +477,6 @@ namespace dxvk {
 
     if (Format == D3D9Format::DF24 && !m_dfSupport)
       return D3D9_VK_FORMAT_MAPPING();
-
-    if (Format == D3D9Format::D32 && !m_d32supportFinal)
-      return D3D9_VK_FORMAT_MAPPING();
     
     if (!m_d24s8Support && mapping.FormatColor == VK_FORMAT_D24_UNORM_S8_UINT)
       mapping.FormatColor = mapping.Aspect & VK_IMAGE_ASPECT_STENCIL_BIT ? VK_FORMAT_D32_SFLOAT_S8_UINT : VK_FORMAT_D32_SFLOAT;
diff --git a/src/d3d9/d3d9_format.h b/src/d3d9/d3d9_format.h
index 6054717df..beff7f67a 100644
--- a/src/d3d9/d3d9_format.h
+++ b/src/d3d9/d3d9_format.h
@@ -217,7 +217,6 @@ namespace dxvk {
 
     bool m_dfSupport;
     bool m_x4r4g4b4Support;
-    bool m_d32supportFinal;
   };
 
   inline bool IsFourCCFormat(D3D9Format format) {
diff --git a/src/d3d9/d3d9_options.cpp b/src/d3d9/d3d9_options.cpp
index 6988b711e..4e2bfc35c 100644
--- a/src/d3d9/d3d9_options.cpp
+++ b/src/d3d9/d3d9_options.cpp
@@ -55,7 +55,6 @@ namespace dxvk {
     this->maxAvailableMemory            = config.getOption<int32_t>     ("d3d9.maxAvailableMemory",            4096);
     this->supportDFFormats              = config.getOption<bool>        ("d3d9.supportDFFormats",              vendorId != uint32_t(DxvkGpuVendor::Nvidia));
     this->supportX4R4G4B4               = config.getOption<bool>        ("d3d9.supportX4R4G4B4",               true);
-    this->supportD32                    = config.getOption<bool>        ("d3d9.supportD32",                    true);
     this->useD32forD24                  = config.getOption<bool>        ("d3d9.useD32forD24",                  false);
     this->disableA8RT                   = config.getOption<bool>        ("d3d9.disableA8RT",                   false);
     this->invariantPosition             = config.getOption<bool>        ("d3d9.invariantPosition",             true);
diff --git a/src/d3d9/d3d9_options.h b/src/d3d9/d3d9_options.h
index 0bc298663..3ba4e3406 100644
--- a/src/d3d9/d3d9_options.h
+++ b/src/d3d9/d3d9_options.h
@@ -78,9 +78,6 @@ namespace dxvk {
     /// Support X4R4G4B4
     bool supportX4R4G4B4;
 
-    /// Support D32
-    bool supportD32;
-
     /// Use D32f for D24
     bool useD32forD24;
 
diff --git a/src/util/config/config.cpp b/src/util/config/config.cpp
index 7d2837046..43c354c54 100644
--- a/src/util/config/config.cpp
+++ b/src/util/config/config.cpp
@@ -555,10 +555,6 @@ namespace dxvk {
     { R"(\\SKShinoviVersus\.exe$)", {{
       { "d3d9.forceAspectRatio",            "16:9" },
     }} },
-    /* Metal Slug X                               */
-    { R"(\\mslugx\.exe$)", {{
-      { "d3d9.supportD32",                  "False" },
-    }} },
     /* Skyrim (NVAPI)                             */
     { R"(\\TESV\.exe$)", {{
       { "d3d9.customVendorId",              "1002" },