From 86f04a2da3256cfc115bee3d7968a4ad62cd1533 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Wed, 26 Jun 2024 00:42:31 +0200 Subject: [PATCH] Revert "[util] Consolidate maxFrameRate options" This reverts commit 1811f4b9950818ba5c8bfbaf06776831ea2cd0cb. The D3D12 Beyond Good and Evil remaster uses the same exe name as the original D3D9 game, so it turns out the separation was useful after all. --- dxvk.conf | 3 ++- src/d3d9/d3d9_options.cpp | 2 +- src/dxgi/dxgi_options.cpp | 2 +- src/util/config/config.cpp | 42 +++++++++++++++++++------------------- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dxvk.conf b/dxvk.conf index 472a1904e..10c95d442 100644 --- a/dxvk.conf +++ b/dxvk.conf @@ -50,7 +50,8 @@ # actual display mode does not match the game's one. # n: Limit to n frames per second. -# dxvk.maxFrameRate = 0 +# dxgi.maxFrameRate = 0 +# d3d9.maxFrameRate = 0 # Override PCI vendor and device IDs reported to the application. Can diff --git a/src/d3d9/d3d9_options.cpp b/src/d3d9/d3d9_options.cpp index ffdb2675a..6988b711e 100644 --- a/src/d3d9/d3d9_options.cpp +++ b/src/d3d9/d3d9_options.cpp @@ -42,7 +42,7 @@ namespace dxvk { : (adapter != nullptr ? adapter->deviceProperties().vendorID : 0); this->maxFrameLatency = config.getOption ("d3d9.maxFrameLatency", 0); - this->maxFrameRate = config.getOption ("dxvk.maxFrameRate", 0); + this->maxFrameRate = config.getOption ("d3d9.maxFrameRate", 0); this->presentInterval = config.getOption ("d3d9.presentInterval", -1); this->shaderModel = config.getOption ("d3d9.shaderModel", 3); this->dpiAware = config.getOption ("d3d9.dpiAware", true); diff --git a/src/dxgi/dxgi_options.cpp b/src/dxgi/dxgi_options.cpp index 994deceda..f352dfdbf 100644 --- a/src/dxgi/dxgi_options.cpp +++ b/src/dxgi/dxgi_options.cpp @@ -93,7 +93,7 @@ namespace dxvk { this->maxDeviceMemory = VkDeviceSize(config.getOption("dxgi.maxDeviceMemory", 0)) << 20; this->maxSharedMemory = VkDeviceSize(config.getOption("dxgi.maxSharedMemory", 0)) << 20; - this->maxFrameRate = config.getOption("dxvk.maxFrameRate", 0); + this->maxFrameRate = config.getOption("dxgi.maxFrameRate", 0); this->syncInterval = config.getOption("dxgi.syncInterval", -1); // Expose Nvidia GPUs properly if NvAPI is enabled in environment diff --git a/src/util/config/config.cpp b/src/util/config/config.cpp index 183173cc8..cf413f64d 100644 --- a/src/util/config/config.cpp +++ b/src/util/config/config.cpp @@ -314,12 +314,12 @@ namespace dxvk { /* Shantae and the Pirate's Curse * * Game speeds up above 60 fps */ { R"(\\ShantaeCurse\.exe$)", {{ - { "dxvk.maxFrameRate", "60" }, + { "dxgi.maxFrameRate", "60" }, }} }, /* Mighty Switch Force! Collection * * Games speed up above 60 fps */ { R"(\\MSFC\.exe$)", {{ - { "dxvk.maxFrameRate", "60" }, + { "dxgi.maxFrameRate", "60" }, }} }, /* Cardfight!! Vanguard Dear Days: * * Submits command lists multiple times */ @@ -405,7 +405,7 @@ namespace dxvk { * Game speed increases when above 60 fps in * * the tavern area */ { R"(\\BLADESTORM Nightmare\\Launch_(EA|JP)\.exe$)", {{ - { "dxvk.maxFrameRate", "60" }, + { "dxgi.maxFrameRate", "60" }, }} }, /* Ghost Recon Wildlands */ { R"(\\GRW\.exe$)", {{ @@ -486,7 +486,7 @@ namespace dxvk { /* Sonic Adventure 2 */ { R"(\\Sonic Adventure 2\\(launcher|sonic2app)\.exe$)", {{ { "d3d9.floatEmulation", "Strict" }, - { "dxvk.maxFrameRate", "60" }, + { "d3d9.maxFrameRate", "60" }, }} }, /* The Sims 2, Body Shop, @@ -508,7 +508,7 @@ namespace dxvk { Built-in Vsync Locks the game to 30 FPS */ { R"(\\Dead Space\.exe$)", {{ { "d3d9.supportDFFormats", "False" }, - { "dxvk.maxFrameRate", "60" }, + { "d3d9.maxFrameRate", "60" }, { "d3d9.presentInterval", "1" }, }} }, /* Dead Space 2 @@ -599,7 +599,7 @@ namespace dxvk { * D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY buffer */ { R"(\\(trl|tra|tru)\.exe$)", {{ { "d3d9.cachedDynamicBuffers", "True" }, - { "dxvk.maxFrameRate", "60" }, + { "d3d9.maxFrameRate", "60" }, }} }, /* Everquest */ { R"(\\eqgame\.exe$)", {{ @@ -637,7 +637,7 @@ namespace dxvk { }} }, /* Demon Stone breaks at frame rates > 60fps */ { R"(\\Demonstone\.exe$)", {{ - { "dxvk.maxFrameRate", "60" }, + { "d3d9.maxFrameRate", "60" }, }} }, /* Far Cry 1 has worse water rendering when it detects AMD GPUs */ { R"(\\FarCry\.exe$)", {{ @@ -650,7 +650,7 @@ namespace dxvk { }} }, /* Sine Mora EX */ { R"(\\SineMoraEX\.exe$)", {{ - { "dxvk.maxFrameRate", "60" }, + { "d3d9.maxFrameRate", "60" }, }} }, /* Red Orchestra 2 */ { R"(\\ROGame\.exe$)", {{ @@ -687,7 +687,7 @@ namespace dxvk { }} }, /* Limbo */ { R"(\\limbo\.exe$)", {{ - { "dxvk.maxFrameRate", "60" }, + { "d3d9.maxFrameRate", "60" }, }} }, /* Escape from Tarkov launcher Same issue as Warhammer: RoR above */ @@ -731,7 +731,7 @@ namespace dxvk { /* Bionic Commando Physics break at high fps */ { R"(\\bionic_commando\.exe$)", {{ - { "dxvk.maxFrameRate", "60" }, + { "d3d9.maxFrameRate", "60" }, }} }, /* Need For Speed 3 modern patch */ { R"(\\nfs3\.exe$)", {{ @@ -740,12 +740,12 @@ namespace dxvk { /* Beyond Good And Evil * * UI breaks at high fps */ { R"(\\BGE\.exe$)", {{ - { "dxvk.maxFrameRate", "60" }, + { "d3d9.maxFrameRate", "60" }, }} }, /* King Of Fighters XIII * * In-game speed increases on high FPS */ { R"(\\kof(xiii|13_win32_Release)\.exe$)", {{ - { "dxvk.maxFrameRate", "60" }, + { "d3d9.maxFrameRate", "60" }, }} }, /* YS Origin * * Helps very bad frametimes in some areas */ @@ -822,7 +822,7 @@ namespace dxvk { /* Battle Fantasia Revised Edition * * Speedup above 60fps */ { R"(\\bf10\.exe$)", {{ - { "dxvk.maxFrameRate", "60" }, + { "d3d9.maxFrameRate", "60" }, }} }, /* Codename Panzers Phase One/Two * * Main menu won't render after intros * @@ -849,23 +849,23 @@ namespace dxvk { }} }, /* STEINS;GATE ELITE */ { R"(\\SG_ELITE\\Game\.exe$)", {{ - { "dxvk.maxFrameRate", "60" }, + { "d3d9.maxFrameRate", "60" }, }} }, /* The Incredibles */ { R"(\\IncPC\.exe$)", {{ - { "dxvk.maxFrameRate", "59" }, + { "d3d9.maxFrameRate", "59" }, }} }, /* Conflict Vietnam */ { R"(\\Vietnam\.exe$)", {{ - { "dxvk.maxFrameRate", "60" }, + { "d3d9.maxFrameRate", "60" }, }} }, /* Project: Snowblind */ { R"(\\Snowblind\.(SP|MP|exe)$)", {{ - { "dxvk.maxFrameRate", "60" }, + { "d3d9.maxFrameRate", "60" }, }} }, /* Aviary Attorney */ { R"(\\Aviary Attorney\\nw\.exe$)", {{ - { "dxvk.maxFrameRate", "60" }, + { "d3d9.maxFrameRate", "60" }, }} }, /* Drakensang: The Dark Eye */ { R"(\\drakensang\.exe$)", {{ @@ -891,7 +891,7 @@ namespace dxvk { }} }, /* Sonic CD */ { R"(\\soniccd\.exe$)", {{ - { "dxvk.maxFrameRate", "60" }, + { "d3d9.maxFrameRate", "60" }, }} }, /* UK Truck Simulator 1 */ { R"(\\UK Truck Simulator\\bin\\win_x86\\game\.exe$)", {{ @@ -910,7 +910,7 @@ namespace dxvk { }} }, /* Dark Void - Crashes above 60fps in places */ { R"(\\ShippingPC-SkyGame\.exe$)", {{ - { "dxvk.maxFrameRate", "60" }, + { "d3d9.maxFrameRate", "60" }, }} }, /* 9th Dawn II * * OpenGL game that also spins up d3d9 * @@ -1000,7 +1000,7 @@ namespace dxvk { /* Fallout 4: Defaults to 45 FPS on OLED, but also breaks above 60 FPS */ { R"(\\Fallout4\.exe$)", {{ { "dxgi.syncInterval", "1" }, - { "dxvk.maxFrameRate", "60" }, + { "dxgi.maxFrameRate", "60" }, }} }, }};