From 7f89fe140662bd90dc637235dd3144867c15d84c Mon Sep 17 00:00:00 2001 From: Robin Kertels Date: Fri, 10 Sep 2021 21:03:17 +0200 Subject: [PATCH] [d3d9+utils] Remove swvp hack --- dxvk.conf | 11 ----------- src/d3d9/d3d9_device.cpp | 6 +++--- src/d3d9/d3d9_options.cpp | 3 --- src/d3d9/d3d9_options.h | 5 ----- src/util/config/config.cpp | 12 ------------ 5 files changed, 3 insertions(+), 34 deletions(-) diff --git a/dxvk.conf b/dxvk.conf index 554f3b067..1e2592ba9 100644 --- a/dxvk.conf +++ b/dxvk.conf @@ -439,17 +439,6 @@ # d3d9.supportD32 = True -# SWVP Constant Counts -# -# The number of constants available when using Software Vertex Processing. -# -# Supported values: -# - Integers - -# d3d9.swvpFloatCount = 8192 -# d3d9.swvpIntCount = 2048 -# d3d9.swvpBoolCount = 2048 - # Disable A8 as a Render Target # # Disable support for A8 format render targets diff --git a/src/d3d9/d3d9_device.cpp b/src/d3d9/d3d9_device.cpp index 69ac5bc4a..bbd5d1136 100644 --- a/src/d3d9/d3d9_device.cpp +++ b/src/d3d9/d3d9_device.cpp @@ -3923,9 +3923,9 @@ namespace dxvk { void D3D9DeviceEx::DetermineConstantLayouts(bool canSWVP) { - m_vsLayout.floatCount = canSWVP ? uint32_t(m_d3d9Options.swvpFloatCount) : caps::MaxFloatConstantsVS; - m_vsLayout.intCount = canSWVP ? uint32_t(m_d3d9Options.swvpIntCount) : caps::MaxOtherConstants; - m_vsLayout.boolCount = canSWVP ? uint32_t(m_d3d9Options.swvpBoolCount) : caps::MaxOtherConstants; + m_vsLayout.floatCount = canSWVP ? caps::MaxFloatConstantsSoftware : caps::MaxFloatConstantsVS; + m_vsLayout.intCount = canSWVP ? caps::MaxOtherConstantsSoftware : caps::MaxOtherConstants; + m_vsLayout.boolCount = canSWVP ? caps::MaxOtherConstantsSoftware : caps::MaxOtherConstants; m_vsLayout.bitmaskCount = align(m_vsLayout.boolCount, 32) / 32; m_psLayout.floatCount = caps::MaxFloatConstantsPS; diff --git a/src/d3d9/d3d9_options.cpp b/src/d3d9/d3d9_options.cpp index d373aa9d3..b99deec29 100644 --- a/src/d3d9/d3d9_options.cpp +++ b/src/d3d9/d3d9_options.cpp @@ -56,9 +56,6 @@ namespace dxvk { this->supportDFFormats = config.getOption ("d3d9.supportDFFormats", true); this->supportX4R4G4B4 = config.getOption ("d3d9.supportX4R4G4B4", true); this->supportD32 = config.getOption ("d3d9.supportD32", true); - this->swvpFloatCount = config.getOption ("d3d9.swvpFloatCount", caps::MaxFloatConstantsSoftware); - this->swvpIntCount = config.getOption ("d3d9.swvpIntCount", caps::MaxOtherConstantsSoftware); - this->swvpBoolCount = config.getOption ("d3d9.swvpBoolCount", caps::MaxOtherConstantsSoftware); this->disableA8RT = config.getOption ("d3d9.disableA8RT", false); this->invariantPosition = config.getOption ("d3d9.invariantPosition", false); this->memoryTrackTest = config.getOption ("d3d9.memoryTrackTest", false); diff --git a/src/d3d9/d3d9_options.h b/src/d3d9/d3d9_options.h index e49bb61ed..79e00f841 100644 --- a/src/d3d9/d3d9_options.h +++ b/src/d3d9/d3d9_options.h @@ -94,11 +94,6 @@ namespace dxvk { /// Support D32 bool supportD32; - /// SWVP Constant Limits - int32_t swvpFloatCount; - int32_t swvpIntCount; - int32_t swvpBoolCount; - /// Disable D3DFMT_A8 for render targets. /// Specifically to work around a game /// bug in The Sims 2 that happens on native too! diff --git a/src/util/config/config.cpp b/src/util/config/config.cpp index 56ab756a5..2d2e5af12 100644 --- a/src/util/config/config.cpp +++ b/src/util/config/config.cpp @@ -295,12 +295,6 @@ namespace dxvk { { "d3d9.supportX4R4G4B4", "False" }, { "d3d9.maxAvailableMemory", "2048" }, { "d3d9.memoryTrackTest", "True" }, - // The Sims 2 will try to upload 1024 constants - // every frame otherwise, which it never uses - // causing a massive discard + upload. - { "d3d9.swvpFloatCount", "384" }, - { "d3d9.swvpIntCount", "16" }, - { "d3d9.swvpBoolCount", "16" }, }} }, /* Dead Space uses the a NULL render target instead of a 1x1 one if DF24 is NOT supported */ @@ -409,12 +403,6 @@ namespace dxvk { { "d3d9.deferSurfaceCreation", "True" }, { "d3d9.memoryTrackTest", "True" }, }} }, - /* TrackMania Forever */ - { R"(\\TmForever\.exe$)", {{ - { "d3d9.swvpFloatCount", "256" }, - { "d3d9.swvpIntCount", "16" }, - { "d3d9.swvpBoolCount", "16" }, - }} }, /* Mafia 2 */ { R"(\\mafia2\.exe$)", {{ { "d3d9.customVendorId", "10de" },