diff options
author | Jens Peters <jp7677@gmail.com> | 2023-08-24 23:08:06 +0300 |
---|---|---|
committer | Joshie <joshua@froggi.es> | 2023-08-25 07:21:29 +0300 |
commit | 02db89ac30291629f30ca59999cee7748f764b90 (patch) | |
tree | 8b518e1fde132e0b885d27412e7fcc906c385d71 /src | |
parent | 92dc61f161939535c8984ef8a33b393a0e51dcdf (diff) |
[dxgi] Allow HDR on UE4/D3D11 when NVAPI is enabled
Diffstat (limited to 'src')
-rw-r--r-- | src/dxgi/dxgi_options.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/dxgi/dxgi_options.cpp b/src/dxgi/dxgi_options.cpp index 522a47e6..c78bc0ee 100644 --- a/src/dxgi/dxgi_options.cpp +++ b/src/dxgi/dxgi_options.cpp @@ -27,6 +27,11 @@ namespace dxvk { } + static bool isNvapiEnabled() { + return env::getEnvVar("DXVK_ENABLE_NVAPI") == "1"; + } + + static bool isHDRDisallowed() { #ifdef _WIN32 // Unreal Engine 4 titles use AGS/NVAPI to try and enable @@ -53,7 +58,7 @@ namespace dxvk { bool isUE4 = exeName.find("-Win64-Shipping") != std::string::npos; bool hasD3D12 = GetModuleHandleA("d3d12") != nullptr; - if (isUE4 && !hasD3D12) + if (isUE4 && !hasD3D12 && !isNvapiEnabled()) return true; #endif return false; @@ -74,7 +79,7 @@ namespace dxvk { this->maxSharedMemory = VkDeviceSize(config.getOption<int32_t>("dxgi.maxSharedMemory", 0)) << 20; // Expose Nvidia GPUs properly if NvAPI is enabled in environment - this->hideNvidiaGpu = env::getEnvVar("DXVK_ENABLE_NVAPI") != "1"; + this->hideNvidiaGpu = !isNvapiEnabled(); Tristate hideNvidiaGpuOption = config.getOption<Tristate>("dxgi.hideNvidiaGpu", Tristate::Auto); |