1
0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-11 19:24:11 +01:00

[dxgi] Change default behaviour of hideNvkGpu option

This commit is contained in:
Philip Rebohle 2024-03-15 22:48:57 +01:00
parent 538f1d13d4
commit e857b09432
2 changed files with 5 additions and 8 deletions

View File

@ -82,12 +82,12 @@ namespace dxvk {
// Expose Nvidia GPUs properly if NvAPI is enabled in environment // Expose Nvidia GPUs properly if NvAPI is enabled in environment
this->hideNvidiaGpu = !isNvapiEnabled(); this->hideNvidiaGpu = !isNvapiEnabled();
applyTristate(this->hideNvidiaGpu, config.getOption<Tristate>("dxgi.hideNvidiaGpu", Tristate::Auto));
Tristate hideNvidiaGpuOption = config.getOption<Tristate>("dxgi.hideNvidiaGpu", Tristate::Auto); // Treat NVK adapters the same as Nvidia cards on the proprietary by
applyTristate(this->hideNvidiaGpu, hideNvidiaGpuOption); // default, but provide an override in case something isn't working.
this->hideNvkGpu = this->hideNvidiaGpu;
// Always hide NVK devices by default since some NVAPI functionality may not work applyTristate(this->hideNvkGpu, config.getOption<Tristate>("dxgi.hideNvkGpu", Tristate::Auto));
this->hideNvkGpu = config.getOption<Tristate>("dxgi.hideNvkGpu", Tristate::Auto) == Tristate::True;
// Expose AMD and Intel GPU by default, unless a config override is active. // 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 // Implement as a tristate so that we have the option to introduce similar

View File

@ -54,13 +54,11 @@ namespace dxvk {
* Intel needs to match the AMD result */ * Intel needs to match the AMD result */
{ R"(\\(farcry3|fc3_blooddragon)_d3d11\.exe$)", {{ { R"(\\(farcry3|fc3_blooddragon)_d3d11\.exe$)", {{
{ "dxgi.hideNvidiaGpu", "False" }, { "dxgi.hideNvidiaGpu", "False" },
{ "dxgi.hideNvkGpu", "False" },
{ "dxgi.hideIntelGpu", "True" }, { "dxgi.hideIntelGpu", "True" },
}} }, }} },
/* Far Cry 4 and Primal: Same as Far Cry 3 */ /* Far Cry 4 and Primal: Same as Far Cry 3 */
{ R"(\\(FarCry4|FCPrimal)\.exe$)", {{ { R"(\\(FarCry4|FCPrimal)\.exe$)", {{
{ "dxgi.hideNvidiaGpu", "False" }, { "dxgi.hideNvidiaGpu", "False" },
{ "dxgi.hideNvkGpu", "False" },
{ "dxgi.hideIntelGpu", "True" }, { "dxgi.hideIntelGpu", "True" },
}} }, }} },
/* Frostpunk: Renders one frame with D3D9 * /* Frostpunk: Renders one frame with D3D9 *
@ -885,7 +883,6 @@ namespace dxvk {
* GPU unless dxgi Id match actual GPU Id */ * GPU unless dxgi Id match actual GPU Id */
{ R"(\\Diablo IV\.exe$)", {{ { R"(\\Diablo IV\.exe$)", {{
{ "dxgi.hideNvidiaGpu", "False" }, { "dxgi.hideNvidiaGpu", "False" },
{ "dxgi.hideNvkGpu", "False" },
}} }, }} },
/* WILD HEARTS™ * /* WILD HEARTS™ *
* D3D12 title using D3D11 device for * * D3D12 title using D3D11 device for *