backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[dxvk] Load user config as well as per-app options in DxvkInstance

Browse Source
This commit is contained in:
Philip Rebohle 2018-08-07 14:14:41 +02:00
parent 5e58083c01
commit c0398caa2b
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dxvk/dxvk_instance.cpp
View File

@ -11,6 +11,9 @@ namespace dxvk {
Logger::info(str::format("Game: ", env::getExeName())); Logger::info(str::format("Game: ", env::getExeName()));
Logger::info(str::format("DXVK: ", DXVK_VERSION)); Logger::info(str::format("DXVK: ", DXVK_VERSION));
m_config = getUserConfig();
m_config.merge(getAppConfig(env::getExeName()));
g_vrInstance.initInstanceExtensions(); g_vrInstance.initInstanceExtensions();
m_vkl = new vk::LibraryFn(); m_vkl = new vk::LibraryFn();

17
src/dxvk/dxvk_instance.h
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include "../util/config/config_user.h"
#include "dxvk_adapter.h" #include "dxvk_adapter.h"
#include "dxvk_device.h" #include "dxvk_device.h"
#include "dxvk_openvr.h" #include "dxvk_openvr.h"
@ -45,8 +47,21 @@ namespace dxvk {
Rc<DxvkAdapter> enumAdapters( Rc<DxvkAdapter> enumAdapters(
uint32_t index) const; 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::LibraryFn> m_vkl;
Rc<vk::InstanceFn> m_vki; Rc<vk::InstanceFn> m_vki;