From cc18730967d86b004c6650f895c1488ba9a8fd0b Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Mon, 11 Nov 2019 23:30:35 +0100
Subject: [PATCH] [dxvk] Enable option to disable OpenVR integration

---
 src/dxvk/dxvk_instance.cpp | 4 +++-
 src/dxvk/dxvk_options.cpp  | 1 +
 src/dxvk/dxvk_options.h    | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/dxvk/dxvk_instance.cpp b/src/dxvk/dxvk_instance.cpp
index 14544ec03..564f1e95e 100644
--- a/src/dxvk/dxvk_instance.cpp
+++ b/src/dxvk/dxvk_instance.cpp
@@ -19,7 +19,9 @@ namespace dxvk {
     m_options = DxvkOptions(m_config);
 
     m_extProviders.push_back(&DxvkPlatformExts::s_instance);
-    m_extProviders.push_back(&VrInstance::s_instance);
+
+    if (m_options.enableOpenVR)
+      m_extProviders.push_back(&VrInstance::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 6f7eea027..603000b60 100644
--- a/src/dxvk/dxvk_options.cpp
+++ b/src/dxvk/dxvk_options.cpp
@@ -4,6 +4,7 @@ namespace dxvk {
 
   DxvkOptions::DxvkOptions(const Config& config) {
     enableStateCache      = config.getOption<bool>    ("dxvk.enableStateCache",       true);
+    enableOpenVR          = config.getOption<bool>    ("dxvk.enableOpenVR",           true);
     numCompilerThreads    = config.getOption<int32_t> ("dxvk.numCompilerThreads",     0);
     asyncPresent          = config.getOption<Tristate>("dxvk.asyncPresent",           Tristate::Auto);
     useRawSsbo            = config.getOption<Tristate>("dxvk.useRawSsbo",             Tristate::Auto);
diff --git a/src/dxvk/dxvk_options.h b/src/dxvk/dxvk_options.h
index c02a0f77e..35de1e16a 100644
--- a/src/dxvk/dxvk_options.h
+++ b/src/dxvk/dxvk_options.h
@@ -11,6 +11,9 @@ namespace dxvk {
     /// Enable state cache
     bool enableStateCache;
 
+    /// Enables OpenVR loading
+    bool enableOpenVR;
+
     /// Number of compiler threads
     /// when using the state cache
     int32_t numCompilerThreads;