From 7a0360d7c27f616f5d219c52678559ce800898f0 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Sat, 19 Oct 2019 00:34:34 +0200
Subject: [PATCH] [dxgi] Remove useless d3d10.enable option

---
 dxvk.conf                 |  7 -------
 src/dxgi/dxgi_adapter.cpp | 10 +++-------
 src/dxgi/dxgi_options.cpp |  1 -
 src/dxgi/dxgi_options.h   |  3 ---
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/dxvk.conf b/dxvk.conf
index 32065ec9..5f531cf8 100644
--- a/dxvk.conf
+++ b/dxvk.conf
@@ -63,13 +63,6 @@
 # dxgi.syncInterval = -1
 
 
-# Enables or dsables d3d10 support.
-# 
-# Supported values: True, False
-
-# d3d10.enable = True
-
-
 # Handle D3D11_MAP_FLAG_DO_NOT_WAIT correctly when D3D11DeviceContext::Map()
 # is called. Enabling this can potentially improve performance, but breaks
 # games which do not expect Map() to return an error despite using the flag.
diff --git a/src/dxgi/dxgi_adapter.cpp b/src/dxgi/dxgi_adapter.cpp
index 86bd012f..f38df5de 100644
--- a/src/dxgi/dxgi_adapter.cpp
+++ b/src/dxgi/dxgi_adapter.cpp
@@ -108,15 +108,11 @@ namespace dxvk {
           LARGE_INTEGER*            pUMDVersion) {
     HRESULT hr = DXGI_ERROR_UNSUPPORTED;
 
-    if (InterfaceName == __uuidof(IDXGIDevice))
+    if (InterfaceName == __uuidof(IDXGIDevice)
+     || InterfaceName == __uuidof(ID3D10Device)
+     || InterfaceName == __uuidof(ID3D10Device1))
       hr = S_OK;
 
-    if (m_factory->GetOptions()->d3d10Enable) {
-      if (InterfaceName == __uuidof(ID3D10Device)
-       || InterfaceName == __uuidof(ID3D10Device1))
-        hr = S_OK;
-    }
-
     // We can't really reconstruct the version numbers
     // returned by Windows drivers from Vulkan data
     if (SUCCEEDED(hr) && pUMDVersion)
diff --git a/src/dxgi/dxgi_options.cpp b/src/dxgi/dxgi_options.cpp
index e263be7c..79070114 100644
--- a/src/dxgi/dxgi_options.cpp
+++ b/src/dxgi/dxgi_options.cpp
@@ -36,7 +36,6 @@ namespace dxvk {
     this->maxDeviceMemory = VkDeviceSize(config.getOption<int32_t>("dxgi.maxDeviceMemory", 0)) << 20;
     this->maxSharedMemory = VkDeviceSize(config.getOption<int32_t>("dxgi.maxSharedMemory", 0)) << 20;
 
-    this->d3d10Enable = config.getOption<bool>("d3d10.enable", true);
     this->nvapiHack   = config.getOption<bool>("dxgi.nvapiHack", true);
   }
   
diff --git a/src/dxgi/dxgi_options.h b/src/dxgi/dxgi_options.h
index d5f3bb23..1717ea52 100644
--- a/src/dxgi/dxgi_options.h
+++ b/src/dxgi/dxgi_options.h
@@ -29,9 +29,6 @@ namespace dxvk {
     VkDeviceSize maxDeviceMemory;
     VkDeviceSize maxSharedMemory;
 
-    /// Enables D3D10 support
-    bool d3d10Enable;
-
     /// Enables nvapi workaround
     bool nvapiHack;
   };