diff --git a/src/dxgi/dxgi_options.cpp b/src/dxgi/dxgi_options.cpp index f3a3a492..5bc98da6 100644 --- a/src/dxgi/dxgi_options.cpp +++ b/src/dxgi/dxgi_options.cpp @@ -82,12 +82,12 @@ namespace dxvk { // Expose Nvidia GPUs properly if NvAPI is enabled in environment this->hideNvidiaGpu = !isNvapiEnabled(); + applyTristate(this->hideNvidiaGpu, config.getOption("dxgi.hideNvidiaGpu", Tristate::Auto)); - Tristate hideNvidiaGpuOption = config.getOption("dxgi.hideNvidiaGpu", Tristate::Auto); - applyTristate(this->hideNvidiaGpu, hideNvidiaGpuOption); - - // Always hide NVK devices by default since some NVAPI functionality may not work - this->hideNvkGpu = config.getOption("dxgi.hideNvkGpu", Tristate::Auto) == Tristate::True; + // Treat NVK adapters the same as Nvidia cards on the proprietary by + // default, but provide an override in case something isn't working. + this->hideNvkGpu = this->hideNvidiaGpu; + applyTristate(this->hideNvkGpu, config.getOption("dxgi.hideNvkGpu", Tristate::Auto)); // Expose AMD and Intel GPU by default, unless a config override is active. // Implement as a tristate so that we have the option to introduce similar diff --git a/src/util/config/config.cpp b/src/util/config/config.cpp index 4bd98e49..dd9424ef 100644 --- a/src/util/config/config.cpp +++ b/src/util/config/config.cpp @@ -54,13 +54,11 @@ namespace dxvk { * Intel needs to match the AMD result */ { R"(\\(farcry3|fc3_blooddragon)_d3d11\.exe$)", {{ { "dxgi.hideNvidiaGpu", "False" }, - { "dxgi.hideNvkGpu", "False" }, { "dxgi.hideIntelGpu", "True" }, }} }, /* Far Cry 4 and Primal: Same as Far Cry 3 */ { R"(\\(FarCry4|FCPrimal)\.exe$)", {{ { "dxgi.hideNvidiaGpu", "False" }, - { "dxgi.hideNvkGpu", "False" }, { "dxgi.hideIntelGpu", "True" }, }} }, /* Frostpunk: Renders one frame with D3D9 * @@ -885,7 +883,6 @@ namespace dxvk { * GPU unless dxgi Id match actual GPU Id */ { R"(\\Diablo IV\.exe$)", {{ { "dxgi.hideNvidiaGpu", "False" }, - { "dxgi.hideNvkGpu", "False" }, }} }, /* WILD HEARTS™️ * * D3D12 title using D3D11 device for *