diff --git a/src/d3d9/d3d9_device.cpp b/src/d3d9/d3d9_device.cpp index 4e187a015..5bc4edb05 100644 --- a/src/d3d9/d3d9_device.cpp +++ b/src/d3d9/d3d9_device.cpp @@ -3957,9 +3957,6 @@ namespace dxvk { if (unlikely((Flags & (D3DLOCK_DISCARD | D3DLOCK_READONLY)) == (D3DLOCK_DISCARD | D3DLOCK_READONLY))) return D3DERR_INVALIDCALL; - if (unlikely(!m_d3d9Options.allowLockFlagReadonly)) - Flags &= ~D3DLOCK_READONLY; - if (unlikely(!m_d3d9Options.allowDoNotWait)) Flags &= ~D3DLOCK_DONOTWAIT; @@ -4337,9 +4334,6 @@ namespace dxvk { if (unlikely(ppbData == nullptr)) return D3DERR_INVALIDCALL; - if (!m_d3d9Options.allowLockFlagReadonly) - Flags &= ~D3DLOCK_READONLY; - if (!m_d3d9Options.allowDiscard) Flags &= ~D3DLOCK_DISCARD; diff --git a/src/d3d9/d3d9_options.cpp b/src/d3d9/d3d9_options.cpp index c014f7c8a..2af057174 100644 --- a/src/d3d9/d3d9_options.cpp +++ b/src/d3d9/d3d9_options.cpp @@ -44,7 +44,6 @@ namespace dxvk { this->shaderModel = config.getOption ("d3d9.shaderModel", 3); this->evictManagedOnUnlock = config.getOption ("d3d9.evictManagedOnUnlock", false); this->dpiAware = config.getOption ("d3d9.dpiAware", true); - this->allowLockFlagReadonly = config.getOption ("d3d9.allowLockFlagReadonly", true); this->strictConstantCopies = config.getOption ("d3d9.strictConstantCopies", false); this->strictPow = config.getOption ("d3d9.strictPow", true); this->lenientClear = config.getOption ("d3d9.lenientClear", false); diff --git a/src/d3d9/d3d9_options.h b/src/d3d9/d3d9_options.h index fbfac70f8..df271a116 100644 --- a/src/d3d9/d3d9_options.h +++ b/src/d3d9/d3d9_options.h @@ -34,11 +34,6 @@ namespace dxvk { /// Whether or not to set the process as DPI aware in Windows when the API interface is created. bool dpiAware; - - /// Handle D3DLOCK_READONLY properly. - /// - /// Risen 1 writes to buffers mapped with readonly. - bool allowLockFlagReadonly; /// True: Copy our constant set into UBO if we are relative indexing ever. /// False: Copy our constant set into UBO if we are relative indexing at the start of a defined constant diff --git a/src/util/config/config.cpp b/src/util/config/config.cpp index cbfeff9a2..89d8b9ce7 100644 --- a/src/util/config/config.cpp +++ b/src/util/config/config.cpp @@ -236,18 +236,12 @@ namespace dxvk { }} }, /* Gothic 3 */ { R"(\\Gothic(3|3Final| III Forsaken Gods)\.exe$)", {{ - { "d3d9.allowLockFlagReadonly", "False" }, { "d3d9.supportDFFormats", "False" }, }} }, /* Risen */ { R"(\\Risen[23]?\.exe$)", {{ - { "d3d9.allowLockFlagReadonly", "False" }, { "d3d9.invariantPosition", "True" }, }} }, - /* Nostale */ - { R"(\\NostaleClientX\.exe$)", {{ - { "d3d9.allowLockFlagReadonly", "False" }, - }} }, /* Sonic Adventure 2 */ { R"(\\Sonic Adventure 2\\(launcher|sonic2app)\.exe$)", {{ { "d3d9.floatEmulation", "False" }, @@ -277,10 +271,6 @@ namespace dxvk { { R"(\\Dead Space\.exe$)", {{ { "d3d9.supportDFFormats", "False" }, }} }, - /* Burnout Paradise */ - { R"(\\BurnoutParadise\.exe$)", {{ - { "d3d9.allowLockFlagReadonly", "False" }, - }} }, /* Halo 2 */ { R"(\\halo2\.exe$)", {{ { "d3d9.invariantPosition", "True" },