niansa-misc/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-06 20:58:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "[util] Consolidate maxFrameRate options"

Browse source 
This reverts commit 1811f4b995.

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.
This commit is contained in:
Philip Rebohle 2024-06-26 00:42:31 +02:00
parent 8573190c7d
commit 86f04a2da3
4 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dxvk.conf
View file

@ -50,7 +50,8 @@
# actual display mode does not match the game's one. # actual display mode does not match the game's one.
# n: Limit to n frames per second. # 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 # Override PCI vendor and device IDs reported to the application. Can

2
src/d3d9/d3d9_options.cpp
View file

@ -42,7 +42,7 @@ namespace dxvk {
: (adapter != nullptr ? adapter->deviceProperties().vendorID : 0); : (adapter != nullptr ? adapter->deviceProperties().vendorID : 0);
this->maxFrameLatency = config.getOption<int32_t> ("d3d9.maxFrameLatency", 0); this->maxFrameLatency = config.getOption<int32_t> ("d3d9.maxFrameLatency", 0);
this->maxFrameRate = config.getOption<int32_t> ("dxvk.maxFrameRate", 0); this->maxFrameRate = config.getOption<int32_t> ("d3d9.maxFrameRate", 0);
this->presentInterval = config.getOption<int32_t> ("d3d9.presentInterval", -1); this->presentInterval = config.getOption<int32_t> ("d3d9.presentInterval", -1);
this->shaderModel = config.getOption<int32_t> ("d3d9.shaderModel", 3); this->shaderModel = config.getOption<int32_t> ("d3d9.shaderModel", 3);
this->dpiAware = config.getOption<bool> ("d3d9.dpiAware", true); this->dpiAware = config.getOption<bool> ("d3d9.dpiAware", true);

2
src/dxgi/dxgi_options.cpp
View file

@ -93,7 +93,7 @@ namespace dxvk {
this->maxDeviceMemory = VkDeviceSize(config.getOption<int32_t>("dxgi.maxDeviceMemory", 0)) << 20; this->maxDeviceMemory = VkDeviceSize(config.getOption<int32_t>("dxgi.maxDeviceMemory", 0)) << 20;
this->maxSharedMemory = VkDeviceSize(config.getOption<int32_t>("dxgi.maxSharedMemory", 0)) << 20; this->maxSharedMemory = VkDeviceSize(config.getOption<int32_t>("dxgi.maxSharedMemory", 0)) << 20;
this->maxFrameRate = config.getOption<int32_t>("dxvk.maxFrameRate", 0); this->maxFrameRate = config.getOption<int32_t>("dxgi.maxFrameRate", 0);
this->syncInterval = config.getOption<int32_t>("dxgi.syncInterval", -1); this->syncInterval = config.getOption<int32_t>("dxgi.syncInterval", -1);
// Expose Nvidia GPUs properly if NvAPI is enabled in environment // Expose Nvidia GPUs properly if NvAPI is enabled in environment

42
src/util/config/config.cpp
View file

@ -314,12 +314,12 @@ namespace dxvk {
/* Shantae and the Pirate's Curse * /* Shantae and the Pirate's Curse *
* Game speeds up above 60 fps */ * Game speeds up above 60 fps */
{ R"(\\ShantaeCurse\.exe$)", {{ { R"(\\ShantaeCurse\.exe$)", {{
{ "dxvk.maxFrameRate", "60" }, { "dxgi.maxFrameRate", "60" },
}} }, }} },
/* Mighty Switch Force! Collection * /* Mighty Switch Force! Collection *
* Games speed up above 60 fps */ * Games speed up above 60 fps */
{ R"(\\MSFC\.exe$)", {{ { R"(\\MSFC\.exe$)", {{
{ "dxvk.maxFrameRate", "60" }, { "dxgi.maxFrameRate", "60" },
}} }, }} },
/* Cardfight!! Vanguard Dear Days: * /* Cardfight!! Vanguard Dear Days: *
* Submits command lists multiple times */ * Submits command lists multiple times */
@ -405,7 +405,7 @@ namespace dxvk {
* Game speed increases when above 60 fps in * * Game speed increases when above 60 fps in *
* the tavern area */ * the tavern area */
{ R"(\\BLADESTORM Nightmare\\Launch_(EA|JP)\.exe$)", {{ { R"(\\BLADESTORM Nightmare\\Launch_(EA|JP)\.exe$)", {{
{ "dxvk.maxFrameRate", "60" }, { "dxgi.maxFrameRate", "60" },
}} }, }} },
/* Ghost Recon Wildlands */ /* Ghost Recon Wildlands */
{ R"(\\GRW\.exe$)", {{ { R"(\\GRW\.exe$)", {{
@ -486,7 +486,7 @@ namespace dxvk {
/* Sonic Adventure 2 */ /* Sonic Adventure 2 */
{ R"(\\Sonic Adventure 2\\(launcher|sonic2app)\.exe$)", {{ { R"(\\Sonic Adventure 2\\(launcher|sonic2app)\.exe$)", {{
{ "d3d9.floatEmulation", "Strict" }, { "d3d9.floatEmulation", "Strict" },
{ "dxvk.maxFrameRate", "60" }, { "d3d9.maxFrameRate", "60" },
}} }, }} },
/* The Sims 2, /* The Sims 2,
Body Shop, Body Shop,
@ -508,7 +508,7 @@ namespace dxvk {
Built-in Vsync Locks the game to 30 FPS */ Built-in Vsync Locks the game to 30 FPS */
{ R"(\\Dead Space\.exe$)", {{ { R"(\\Dead Space\.exe$)", {{
{ "d3d9.supportDFFormats", "False" }, { "d3d9.supportDFFormats", "False" },
{ "dxvk.maxFrameRate", "60" }, { "d3d9.maxFrameRate", "60" },
{ "d3d9.presentInterval", "1" }, { "d3d9.presentInterval", "1" },
}} }, }} },
/* Dead Space 2 /* Dead Space 2
@ -599,7 +599,7 @@ namespace dxvk {
* D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY buffer */ * D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY buffer */
{ R"(\\(trl|tra|tru)\.exe$)", {{ { R"(\\(trl|tra|tru)\.exe$)", {{
{ "d3d9.cachedDynamicBuffers", "True" }, { "d3d9.cachedDynamicBuffers", "True" },
{ "dxvk.maxFrameRate", "60" }, { "d3d9.maxFrameRate", "60" },
}} }, }} },
/* Everquest */ /* Everquest */
{ R"(\\eqgame\.exe$)", {{ { R"(\\eqgame\.exe$)", {{
@ -637,7 +637,7 @@ namespace dxvk {
}} }, }} },
/* Demon Stone breaks at frame rates > 60fps */ /* Demon Stone breaks at frame rates > 60fps */
{ R"(\\Demonstone\.exe$)", {{ { R"(\\Demonstone\.exe$)", {{
{ "dxvk.maxFrameRate", "60" }, { "d3d9.maxFrameRate", "60" },
}} }, }} },
/* Far Cry 1 has worse water rendering when it detects AMD GPUs */ /* Far Cry 1 has worse water rendering when it detects AMD GPUs */
{ R"(\\FarCry\.exe$)", {{ { R"(\\FarCry\.exe$)", {{
@ -650,7 +650,7 @@ namespace dxvk {
}} }, }} },
/* Sine Mora EX */ /* Sine Mora EX */
{ R"(\\SineMoraEX\.exe$)", {{ { R"(\\SineMoraEX\.exe$)", {{
{ "dxvk.maxFrameRate", "60" }, { "d3d9.maxFrameRate", "60" },
}} }, }} },
/* Red Orchestra 2 */ /* Red Orchestra 2 */
{ R"(\\ROGame\.exe$)", {{ { R"(\\ROGame\.exe$)", {{
@ -687,7 +687,7 @@ namespace dxvk {
}} }, }} },
/* Limbo */ /* Limbo */
{ R"(\\limbo\.exe$)", {{ { R"(\\limbo\.exe$)", {{
{ "dxvk.maxFrameRate", "60" }, { "d3d9.maxFrameRate", "60" },
}} }, }} },
/* Escape from Tarkov launcher /* Escape from Tarkov launcher
Same issue as Warhammer: RoR above */ Same issue as Warhammer: RoR above */
@ -731,7 +731,7 @@ namespace dxvk {
/* Bionic Commando /* Bionic Commando
Physics break at high fps */ Physics break at high fps */
{ R"(\\bionic_commando\.exe$)", {{ { R"(\\bionic_commando\.exe$)", {{
{ "dxvk.maxFrameRate", "60" }, { "d3d9.maxFrameRate", "60" },
}} }, }} },
/* Need For Speed 3 modern patch */ /* Need For Speed 3 modern patch */
{ R"(\\nfs3\.exe$)", {{ { R"(\\nfs3\.exe$)", {{
@ -740,12 +740,12 @@ namespace dxvk {
/* Beyond Good And Evil * /* Beyond Good And Evil *
* UI breaks at high fps */ * UI breaks at high fps */
{ R"(\\BGE\.exe$)", {{ { R"(\\BGE\.exe$)", {{
{ "dxvk.maxFrameRate", "60" }, { "d3d9.maxFrameRate", "60" },
}} }, }} },
/* King Of Fighters XIII * /* King Of Fighters XIII *
* In-game speed increases on high FPS */ * In-game speed increases on high FPS */
{ R"(\\kof(xiii|13_win32_Release)\.exe$)", {{ { R"(\\kof(xiii|13_win32_Release)\.exe$)", {{
{ "dxvk.maxFrameRate", "60" }, { "d3d9.maxFrameRate", "60" },
}} }, }} },
/* YS Origin * /* YS Origin *
* Helps very bad frametimes in some areas */ * Helps very bad frametimes in some areas */
@ -822,7 +822,7 @@ namespace dxvk {
/* Battle Fantasia Revised Edition * /* Battle Fantasia Revised Edition *
* Speedup above 60fps */ * Speedup above 60fps */
{ R"(\\bf10\.exe$)", {{ { R"(\\bf10\.exe$)", {{
{ "dxvk.maxFrameRate", "60" }, { "d3d9.maxFrameRate", "60" },
}} }, }} },
/* Codename Panzers Phase One/Two * /* Codename Panzers Phase One/Two *
* Main menu won't render after intros * * Main menu won't render after intros *
@ -849,23 +849,23 @@ namespace dxvk {
}} }, }} },
/* STEINS;GATE ELITE */ /* STEINS;GATE ELITE */
{ R"(\\SG_ELITE\\Game\.exe$)", {{ { R"(\\SG_ELITE\\Game\.exe$)", {{
{ "dxvk.maxFrameRate", "60" }, { "d3d9.maxFrameRate", "60" },
}} }, }} },
/* The Incredibles */ /* The Incredibles */
{ R"(\\IncPC\.exe$)", {{ { R"(\\IncPC\.exe$)", {{
{ "dxvk.maxFrameRate", "59" }, { "d3d9.maxFrameRate", "59" },
}} }, }} },
/* Conflict Vietnam */ /* Conflict Vietnam */
{ R"(\\Vietnam\.exe$)", {{ { R"(\\Vietnam\.exe$)", {{
{ "dxvk.maxFrameRate", "60" }, { "d3d9.maxFrameRate", "60" },
}} }, }} },
/* Project: Snowblind */ /* Project: Snowblind */
{ R"(\\Snowblind\.(SP|MP|exe)$)", {{ { R"(\\Snowblind\.(SP|MP|exe)$)", {{
{ "dxvk.maxFrameRate", "60" }, { "d3d9.maxFrameRate", "60" },
}} }, }} },
/* Aviary Attorney */ /* Aviary Attorney */
{ R"(\\Aviary Attorney\\nw\.exe$)", {{ { R"(\\Aviary Attorney\\nw\.exe$)", {{
{ "dxvk.maxFrameRate", "60" }, { "d3d9.maxFrameRate", "60" },
}} }, }} },
/* Drakensang: The Dark Eye */ /* Drakensang: The Dark Eye */
{ R"(\\drakensang\.exe$)", {{ { R"(\\drakensang\.exe$)", {{
@ -891,7 +891,7 @@ namespace dxvk {
}} }, }} },
/* Sonic CD */ /* Sonic CD */
{ R"(\\soniccd\.exe$)", {{ { R"(\\soniccd\.exe$)", {{
{ "dxvk.maxFrameRate", "60" }, { "d3d9.maxFrameRate", "60" },
}} }, }} },
/* UK Truck Simulator 1 */ /* UK Truck Simulator 1 */
{ R"(\\UK Truck Simulator\\bin\\win_x86\\game\.exe$)", {{ { R"(\\UK Truck Simulator\\bin\\win_x86\\game\.exe$)", {{
@ -910,7 +910,7 @@ namespace dxvk {
}} }, }} },
/* Dark Void - Crashes above 60fps in places */ /* Dark Void - Crashes above 60fps in places */
{ R"(\\ShippingPC-SkyGame\.exe$)", {{ { R"(\\ShippingPC-SkyGame\.exe$)", {{
{ "dxvk.maxFrameRate", "60" }, { "d3d9.maxFrameRate", "60" },
}} }, }} },
/* 9th Dawn II * /* 9th Dawn II *
* OpenGL game that also spins up d3d9 * * 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 */ /* Fallout 4: Defaults to 45 FPS on OLED, but also breaks above 60 FPS */
{ R"(\\Fallout4\.exe$)", {{ { R"(\\Fallout4\.exe$)", {{
{ "dxgi.syncInterval", "1" }, { "dxgi.syncInterval", "1" },
{ "dxvk.maxFrameRate", "60" }, { "dxgi.maxFrameRate", "60" },
}} }, }} },
}}; }};