From b4e4eca99fdaabc6591b5e59e558bc7d2bc7da27 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Mon, 24 Jan 2022 14:50:04 +0100
Subject: [PATCH] [dxvk] Remove options to disable OpenVR/XR support

No longer needed since we no longer load vrclient.so into the game's
process just to query extensions.
---
 src/dxvk/dxvk_instance.cpp |  8 ++------
 src/dxvk/dxvk_options.cpp  |  2 --
 src/dxvk/dxvk_options.h    |  6 ------
 src/util/config/config.cpp | 12 ------------
 4 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/src/dxvk/dxvk_instance.cpp b/src/dxvk/dxvk_instance.cpp
index 6084d0fbc..74c6250fd 100644
--- a/src/dxvk/dxvk_instance.cpp
+++ b/src/dxvk/dxvk_instance.cpp
@@ -20,12 +20,8 @@ namespace dxvk {
     m_options = DxvkOptions(m_config);
 
     m_extProviders.push_back(&DxvkPlatformExts::s_instance);
-
-    if (m_options.enableOpenVR)
-      m_extProviders.push_back(&VrInstance::s_instance);
-
-    if (m_options.enableOpenXR)
-      m_extProviders.push_back(&DxvkXrProvider::s_instance);
+    m_extProviders.push_back(&VrInstance::s_instance);
+    m_extProviders.push_back(&DxvkXrProvider::s_instance);
 
     Logger::info("Built-in extension providers:");
     for (const auto& provider : m_extProviders)
diff --git a/src/dxvk/dxvk_options.cpp b/src/dxvk/dxvk_options.cpp
index ef898dcb6..39e9a8209 100644
--- a/src/dxvk/dxvk_options.cpp
+++ b/src/dxvk/dxvk_options.cpp
@@ -4,8 +4,6 @@ namespace dxvk {
 
   DxvkOptions::DxvkOptions(const Config& config) {
     enableStateCache      = config.getOption<bool>    ("dxvk.enableStateCache",       true);
-    enableOpenVR          = config.getOption<bool>    ("dxvk.enableOpenVR",           true);
-    enableOpenXR          = config.getOption<bool>    ("dxvk.enableOpenXR",           true);
     numCompilerThreads    = config.getOption<int32_t> ("dxvk.numCompilerThreads",     0);
     useRawSsbo            = config.getOption<Tristate>("dxvk.useRawSsbo",             Tristate::Auto);
     shrinkNvidiaHvvHeap   = config.getOption<Tristate>("dxvk.shrinkNvidiaHvvHeap",    Tristate::Auto);
diff --git a/src/dxvk/dxvk_options.h b/src/dxvk/dxvk_options.h
index 88611b4c8..2fb0163a5 100644
--- a/src/dxvk/dxvk_options.h
+++ b/src/dxvk/dxvk_options.h
@@ -11,12 +11,6 @@ namespace dxvk {
     /// Enable state cache
     bool enableStateCache;
 
-    /// Enables OpenVR loading
-    bool enableOpenVR;
-
-    /// Enables OpenXR loading
-    bool enableOpenXR;
-
     /// Number of compiler threads
     /// when using the state cache
     int32_t numCompilerThreads;
diff --git a/src/util/config/config.cpp b/src/util/config/config.cpp
index 19fc3d335..8d9219dae 100644
--- a/src/util/config/config.cpp
+++ b/src/util/config/config.cpp
@@ -139,14 +139,6 @@ namespace dxvk {
     { R"(\\SaintsRowTheThird_DX11\.exe$)", {{
       { "d3d11.constantBufferRangeCheck",   "True" },
     }} },
-    /* Metal Gear Solid 5                         */
-    { R"(\\mgsvtpp\.exe$)", {{
-      { "dxvk.enableOpenVR",                "False" },
-    }} },
-    /* Raft                                       */
-    { R"(\\Raft\.exe$)", {{
-      { "dxvk.enableOpenVR",                "False" },
-    }} },
     /* Crysis 3 - slower if it notices AMD card     *
      * Apitrace mode helps massively in cpu bound   *
      * game parts                                   */
@@ -195,10 +187,6 @@ namespace dxvk {
     { R"(\\F1_20(1[89]|[2-9][0-9])\.exe$)", {{
       { "d3d11.forceTgsmBarriers",          "True" },
     }} },
-    /* Subnautica                                 */
-    { R"(\\Subnautica\.exe$)", {{
-      { "dxvk.enableOpenVR",                "False" },
-    }} },
     /* Blue Reflection                            */
     { R"(\\BLUE_REFLECTION\.exe$)", {{
       { "d3d11.constantBufferRangeCheck",   "True" },