diff --git a/dxvk.conf b/dxvk.conf index eaf2e955..77955735 100644 --- a/dxvk.conf +++ b/dxvk.conf @@ -554,16 +554,6 @@ # d3d9.forceAspectRatio = "" -# Allow Discard -# -# Allow the discard lock flag to be used -# Useful if some apps use this incorrectly. -# -# Supported values: -# - True/False - -# d3d9.allowDiscard = True - # Enumerate by Displays # # Whether we should enumerate D3D9 adapters by display (windows behaviour) diff --git a/src/d3d9/d3d9_device.cpp b/src/d3d9/d3d9_device.cpp index 2ae8e070..d6788c3a 100644 --- a/src/d3d9/d3d9_device.cpp +++ b/src/d3d9/d3d9_device.cpp @@ -4792,9 +4792,6 @@ namespace dxvk { if (unlikely(ppbData == nullptr)) return D3DERR_INVALIDCALL; - if (!m_d3d9Options.allowDiscard) - Flags &= ~D3DLOCK_DISCARD; - auto& desc = *pResource->Desc(); // Ignore DISCARD if NOOVERWRITE is set diff --git a/src/d3d9/d3d9_options.cpp b/src/d3d9/d3d9_options.cpp index 83a23e55..b816d0f7 100644 --- a/src/d3d9/d3d9_options.cpp +++ b/src/d3d9/d3d9_options.cpp @@ -64,7 +64,6 @@ namespace dxvk { this->forceSwapchainMSAA = config.getOption ("d3d9.forceSwapchainMSAA", -1); this->forceSampleRateShading = config.getOption ("d3d9.forceSampleRateShading", false); this->forceAspectRatio = config.getOption ("d3d9.forceAspectRatio", ""); - this->allowDiscard = config.getOption ("d3d9.allowDiscard", true); this->enumerateByDisplays = config.getOption ("d3d9.enumerateByDisplays", true); this->longMad = config.getOption ("d3d9.longMad", false); this->apitraceMode = config.getOption ("d3d9.apitraceMode", false); diff --git a/src/d3d9/d3d9_options.h b/src/d3d9/d3d9_options.h index 923245ed..d4b0257a 100644 --- a/src/d3d9/d3d9_options.h +++ b/src/d3d9/d3d9_options.h @@ -116,9 +116,6 @@ namespace dxvk { /// Forces sample rate shading bool forceSampleRateShading; - /// Allow D3DLOCK_DISCARD - bool allowDiscard; - /// Enumerate adapters by displays bool enumerateByDisplays;