From 1811f4b9950818ba5c8bfbaf06776831ea2cd0cb Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Thu, 6 Jun 2024 11:01:04 +0200 Subject: [PATCH] [util] Consolidate maxFrameRate options --- dxvk.conf | 3 +-- src/d3d9/d3d9_options.cpp | 2 +- src/dxgi/dxgi_options.cpp | 2 +- src/util/config/config.cpp | 42 +++++++++++++++++++------------------- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dxvk.conf b/dxvk.conf index 10c95d442..472a1904e 100644 --- a/dxvk.conf +++ b/dxvk.conf @@ -50,8 +50,7 @@ # actual display mode does not match the game's one. # n: Limit to n frames per second. -# dxgi.maxFrameRate = 0 -# d3d9.maxFrameRate = 0 +# dxvk.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 9671545ea..bda5c49f1 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 ("d3d9.maxFrameRate", 0); + this->maxFrameRate = config.getOption ("dxvk.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 f352dfdbf..994deceda 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("dxgi.maxFrameRate", 0); + this->maxFrameRate = config.getOption("dxvk.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 62745524a..0c7c61758 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$)", {{ - { "dxgi.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* Mighty Switch Force! Collection * * Games speed up above 60 fps */ { R"(\\MSFC\.exe$)", {{ - { "dxgi.maxFrameRate", "60" }, + { "dxvk.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$)", {{ - { "dxgi.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* Ghost Recon Wildlands */ { R"(\\GRW\.exe$)", {{ @@ -481,7 +481,7 @@ namespace dxvk { /* Sonic Adventure 2 */ { R"(\\Sonic Adventure 2\\(launcher|sonic2app)\.exe$)", {{ { "d3d9.floatEmulation", "Strict" }, - { "d3d9.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* The Sims 2, Body Shop, @@ -503,7 +503,7 @@ namespace dxvk { Built-in Vsync Locks the game to 30 FPS */ { R"(\\Dead Space\.exe$)", {{ { "d3d9.supportDFFormats", "False" }, - { "d3d9.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, { "d3d9.presentInterval", "1" }, }} }, /* Halo CE/HaloPC */ @@ -586,7 +586,7 @@ namespace dxvk { * D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY buffer */ { R"(\\(trl|tra|tru)\.exe$)", {{ { "d3d9.cachedDynamicBuffers", "True" }, - { "d3d9.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* Everquest */ { R"(\\eqgame\.exe$)", {{ @@ -624,7 +624,7 @@ namespace dxvk { }} }, /* Demon Stone breaks at frame rates > 60fps */ { R"(\\Demonstone\.exe$)", {{ - { "d3d9.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* Far Cry 1 has worse water rendering when it detects AMD GPUs */ { R"(\\FarCry\.exe$)", {{ @@ -637,7 +637,7 @@ namespace dxvk { }} }, /* Sine Mora EX */ { R"(\\SineMoraEX\.exe$)", {{ - { "d3d9.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* Red Orchestra 2 */ { R"(\\ROGame\.exe$)", {{ @@ -674,7 +674,7 @@ namespace dxvk { }} }, /* Limbo */ { R"(\\limbo\.exe$)", {{ - { "d3d9.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* Escape from Tarkov launcher Same issue as Warhammer: RoR above */ @@ -718,7 +718,7 @@ namespace dxvk { /* Bionic Commando Physics break at high fps */ { R"(\\bionic_commando\.exe$)", {{ - { "d3d9.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* Need For Speed 3 modern patch */ { R"(\\nfs3\.exe$)", {{ @@ -727,12 +727,12 @@ namespace dxvk { /* Beyond Good And Evil * * UI breaks at high fps */ { R"(\\BGE\.exe$)", {{ - { "d3d9.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* King Of Fighters XIII * * In-game speed increases on high FPS */ { R"(\\kof(xiii|13_win32_Release)\.exe$)", {{ - { "d3d9.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* YS Origin * * Helps very bad frametimes in some areas */ @@ -809,7 +809,7 @@ namespace dxvk { /* Battle Fantasia Revised Edition * * Speedup above 60fps */ { R"(\\bf10\.exe$)", {{ - { "d3d9.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* Codename Panzers Phase One/Two * * Main menu won't render after intros * @@ -836,23 +836,23 @@ namespace dxvk { }} }, /* STEINS;GATE ELITE */ { R"(\\SG_ELITE\\Game\.exe$)", {{ - { "d3d9.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* The Incredibles */ { R"(\\IncPC\.exe$)", {{ - { "d3d9.maxFrameRate", "59" }, + { "dxvk.maxFrameRate", "59" }, }} }, /* Conflict Vietnam */ { R"(\\Vietnam\.exe$)", {{ - { "d3d9.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* Project: Snowblind */ { R"(\\Snowblind\.(SP|MP|exe)$)", {{ - { "d3d9.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* Aviary Attorney */ { R"(\\Aviary Attorney\\nw\.exe$)", {{ - { "d3d9.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* Drakensang: The Dark Eye */ { R"(\\drakensang\.exe$)", {{ @@ -878,7 +878,7 @@ namespace dxvk { }} }, /* Sonic CD */ { R"(\\soniccd\.exe$)", {{ - { "d3d9.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* UK Truck Simulator 1 */ { R"(\\UK Truck Simulator\\bin\\win_x86\\game\.exe$)", {{ @@ -897,7 +897,7 @@ namespace dxvk { }} }, /* Dark Void - Crashes above 60fps in places */ { R"(\\ShippingPC-SkyGame\.exe$)", {{ - { "d3d9.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, /* 9th Dawn II * * OpenGL game that also spins up d3d9 * @@ -962,7 +962,7 @@ namespace dxvk { /* Fallout 4: Defaults to 45 FPS on OLED, but also breaks above 60 FPS */ { R"(\\Fallout4\.exe$)", {{ { "dxgi.syncInterval", "1" }, - { "dxgi.maxFrameRate", "60" }, + { "dxvk.maxFrameRate", "60" }, }} }, }};