From c0398caa2b81740a5b407687aefa8dada5017543 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Tue, 7 Aug 2018 14:14:41 +0200
Subject: [PATCH] [dxvk] Load user config as well as per-app options in
 DxvkInstance

---
 src/dxvk/dxvk_instance.cpp |  3 +++
 src/dxvk/dxvk_instance.h   | 17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/dxvk/dxvk_instance.cpp b/src/dxvk/dxvk_instance.cpp
index 28aecfe9..bc96b5c4 100644
--- a/src/dxvk/dxvk_instance.cpp
+++ b/src/dxvk/dxvk_instance.cpp
@@ -11,6 +11,9 @@ namespace dxvk {
     Logger::info(str::format("Game: ", env::getExeName()));
     Logger::info(str::format("DXVK: ", DXVK_VERSION));
 
+    m_config = getUserConfig();
+    m_config.merge(getAppConfig(env::getExeName()));
+
     g_vrInstance.initInstanceExtensions();
 
     m_vkl = new vk::LibraryFn();
diff --git a/src/dxvk/dxvk_instance.h b/src/dxvk/dxvk_instance.h
index 290266a3..4b88a9af 100644
--- a/src/dxvk/dxvk_instance.h
+++ b/src/dxvk/dxvk_instance.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "../util/config/config_user.h"
+
 #include "dxvk_adapter.h"
 #include "dxvk_device.h"
 #include "dxvk_openvr.h"
@@ -45,8 +47,21 @@ namespace dxvk {
     Rc<DxvkAdapter> enumAdapters(
             uint32_t      index) const;
     
-  private:
+    /**
+     * \brief Retrieves configuration options
+     * 
+     * The configuration set contains user-defined
+     * options as well as app-specific options.
+     * \returns Configuration options
+     */
+    const Config& config() const {
+      return m_config;
+    }
     
+  private:
+
+    Config m_config;
+
     Rc<vk::LibraryFn>   m_vkl;
     Rc<vk::InstanceFn>  m_vki;