backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[d3d9+util] Remove AllowLockFlagReadonly option

Browse Source
This commit is contained in:
Robin Kertels 2021-03-19 04:51:57 +01:00 committed by Joshie
parent dba7525954
commit d17f62902d
4 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/d3d9/d3d9_device.cpp
View File

@ -3957,9 +3957,6 @@ namespace dxvk {
if (unlikely((Flags & (D3DLOCK_DISCARD | D3DLOCK_READONLY)) == (D3DLOCK_DISCARD | D3DLOCK_READONLY))) if (unlikely((Flags & (D3DLOCK_DISCARD | D3DLOCK_READONLY)) == (D3DLOCK_DISCARD | D3DLOCK_READONLY)))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
if (unlikely(!m_d3d9Options.allowLockFlagReadonly))
Flags &= ~D3DLOCK_READONLY;
if (unlikely(!m_d3d9Options.allowDoNotWait)) if (unlikely(!m_d3d9Options.allowDoNotWait))
Flags &= ~D3DLOCK_DONOTWAIT; Flags &= ~D3DLOCK_DONOTWAIT;
@ -4337,9 +4334,6 @@ namespace dxvk {
if (unlikely(ppbData == nullptr)) if (unlikely(ppbData == nullptr))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
if (!m_d3d9Options.allowLockFlagReadonly)
Flags &= ~D3DLOCK_READONLY;
if (!m_d3d9Options.allowDiscard) if (!m_d3d9Options.allowDiscard)
Flags &= ~D3DLOCK_DISCARD; Flags &= ~D3DLOCK_DISCARD;

1
src/d3d9/d3d9_options.cpp
View File

@ -44,7 +44,6 @@ namespace dxvk {
this->shaderModel = config.getOption<int32_t> ("d3d9.shaderModel", 3); this->shaderModel = config.getOption<int32_t> ("d3d9.shaderModel", 3);
this->evictManagedOnUnlock = config.getOption<bool> ("d3d9.evictManagedOnUnlock", false); this->evictManagedOnUnlock = config.getOption<bool> ("d3d9.evictManagedOnUnlock", false);
this->dpiAware = config.getOption<bool> ("d3d9.dpiAware", true); this->dpiAware = config.getOption<bool> ("d3d9.dpiAware", true);
this->allowLockFlagReadonly = config.getOption<bool> ("d3d9.allowLockFlagReadonly", true);
this->strictConstantCopies = config.getOption<bool> ("d3d9.strictConstantCopies", false); this->strictConstantCopies = config.getOption<bool> ("d3d9.strictConstantCopies", false);
this->strictPow = config.getOption<bool> ("d3d9.strictPow", true); this->strictPow = config.getOption<bool> ("d3d9.strictPow", true);
this->lenientClear = config.getOption<bool> ("d3d9.lenientClear", false); this->lenientClear = config.getOption<bool> ("d3d9.lenientClear", false);

5
src/d3d9/d3d9_options.h
View File

@ -34,11 +34,6 @@ namespace dxvk {
/// Whether or not to set the process as DPI aware in Windows when the API interface is created. /// Whether or not to set the process as DPI aware in Windows when the API interface is created.
bool dpiAware; 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. /// 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 /// False: Copy our constant set into UBO if we are relative indexing at the start of a defined constant

10
src/util/config/config.cpp
View File

@ -236,18 +236,12 @@ namespace dxvk {
}} }, }} },
/* Gothic 3 */ /* Gothic 3 */
{ R"(\\Gothic(3|3Final| III Forsaken Gods)\.exe$)", {{ { R"(\\Gothic(3|3Final| III Forsaken Gods)\.exe$)", {{
{ "d3d9.allowLockFlagReadonly", "False" },
{ "d3d9.supportDFFormats", "False" }, { "d3d9.supportDFFormats", "False" },
}} }, }} },
/* Risen */ /* Risen */
{ R"(\\Risen[23]?\.exe$)", {{ { R"(\\Risen[23]?\.exe$)", {{
{ "d3d9.allowLockFlagReadonly", "False" },
{ "d3d9.invariantPosition", "True" }, { "d3d9.invariantPosition", "True" },
}} }, }} },
/* Nostale */
{ R"(\\NostaleClientX\.exe$)", {{
{ "d3d9.allowLockFlagReadonly", "False" },
}} },
/* Sonic Adventure 2 */ /* Sonic Adventure 2 */
{ R"(\\Sonic Adventure 2\\(launcher|sonic2app)\.exe$)", {{ { R"(\\Sonic Adventure 2\\(launcher|sonic2app)\.exe$)", {{
{ "d3d9.floatEmulation", "False" }, { "d3d9.floatEmulation", "False" },
@ -277,10 +271,6 @@ namespace dxvk {
{ R"(\\Dead Space\.exe$)", {{ { R"(\\Dead Space\.exe$)", {{
{ "d3d9.supportDFFormats", "False" }, { "d3d9.supportDFFormats", "False" },
}} }, }} },
/* Burnout Paradise */
{ R"(\\BurnoutParadise\.exe$)", {{
{ "d3d9.allowLockFlagReadonly", "False" },
}} },
/* Halo 2 */ /* Halo 2 */
{ R"(\\halo2\.exe$)", {{ { R"(\\halo2\.exe$)", {{
{ "d3d9.invariantPosition", "True" }, { "d3d9.invariantPosition", "True" },