Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/d3d11/d3d11_device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ namespace dxvk {
if (m_d3d11Options.reproducibleCommandStream)
m_dxvkDevice->setSubmissionTimeout(-1ull);

D3D11ShaderResourceView::SetQuarantineEnabled(m_d3d11Options.srvQuarantine);

m_initializer = new D3D11Initializer(this);
m_context = new D3D11ImmediateContext(this, m_dxvkDevice);
m_d3d10Device = new D3D10Device(this, m_context.ptr());
Expand Down
1 change: 1 addition & 0 deletions src/d3d11/d3d11_options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace dxvk {
this->forceSampleRateShading = config.getOption<bool>("d3d11.forceSampleRateShading", false);
this->disableMsaa = config.getOption<bool>("d3d11.disableMsaa", false);
this->enableContextLock = config.getOption<bool>("d3d11.enableContextLock", false);
this->srvQuarantine = config.getOption<bool>("d3d11.srvQuarantine", false);
this->deferSurfaceCreation = config.getOption<bool>("dxgi.deferSurfaceCreation", false);
this->maxFrameLatency = config.getOption<int32_t>("dxgi.maxFrameLatency", 0);
this->exposeDriverCommandLists = config.getOption<bool>("d3d11.exposeDriverCommandLists", true);
Expand Down
7 changes: 7 additions & 0 deletions src/d3d11/d3d11_options.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,13 @@ namespace dxvk {
/// race conditions.
bool enableContextLock = false;

/// Quarantine destroyed shader resource views
///
/// Workaround for games that bind SRV pointers again after
/// releasing them. Keeps a bounded number of destroyed views
/// allocated so that stale binds cannot hit unrelated objects.
bool srvQuarantine = false;

/// Whether to expose the driver command list feature. Enabled by
/// default and generally beneficial, but some games may assume that
/// this is not supported when running on an AMD GPU.
Expand Down
50 changes: 49 additions & 1 deletion src/d3d11/d3d11_view_srv.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,59 @@
#include <array>
#include <atomic>

#include "../util/thread.h"

#include "d3d11_device.h"
#include "d3d11_buffer.h"
#include "d3d11_resource.h"
#include "d3d11_texture.h"
#include "d3d11_view_srv.h"

namespace dxvk {


constexpr size_t SrvQuarantineCount = 4096;

static std::atomic<bool> s_srvQuarantineEnabled = { false };


void D3D11ShaderResourceView::SetQuarantineEnabled(bool enabled) {
s_srvQuarantineEnabled.store(enabled, std::memory_order_relaxed);
}


// Call of Duty: Black Ops 4 re-binds SRV pointers after releasing
// them. Quarantining destroyed views keeps the dead refcount marker
// intact so stale binds cannot reach a recycled object's vtable
void D3D11ShaderResourceView::operator delete(void* ptr) {
if (!ptr)
return;

if (!s_srvQuarantineEnabled.load(std::memory_order_relaxed)) {
::operator delete(ptr);
return;
}

static dxvk::mutex s_mutex;
static std::array<void*, SrvQuarantineCount> s_objects = { };
static size_t s_index = 0;

std::lock_guard<dxvk::mutex> lock(s_mutex);
void*& slot = s_objects[s_index];
s_index = (s_index + 1) % SrvQuarantineCount;

if (slot) {
auto view = static_cast<D3D11ShaderResourceView*>(slot);

// Still bound: leak it instead of freeing, so the context's later
// private release lands on allocated memory
if (!(view->GetPrivateRefCount() & 0x7FFFFFFF))
::operator delete(slot);
}

slot = ptr;
}


D3D11ShaderResourceView::D3D11ShaderResourceView(
D3D11Device* pDevice,
ID3D11Resource* pResource,
Expand Down
6 changes: 5 additions & 1 deletion src/d3d11/d3d11_view_srv.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ namespace dxvk {
const D3D11_SHADER_RESOURCE_VIEW_DESC1* pDesc);

~D3D11ShaderResourceView();


static void SetQuarantineEnabled(bool enabled);

void operator delete(void* ptr);

HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) final;

void STDMETHODCALLTYPE GetResource(ID3D11Resource** ppResource) final;
Expand Down
5 changes: 5 additions & 0 deletions src/util/config/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,11 @@ namespace dxvk {
{ R"(\\iw6sp64_ship\.exe$)", {{
{ "dxvk.zeroShaderScratchMemory", "True" },
}} },
/* Call of Duty Black Ops 4: Re-binds SRV pointers *
* after releasing them, causing use-after-free */
{ R"(\\BlackOps4\.exe$)", {{
{ "d3d11.srvQuarantine", "True" },
}} },
/* Need for Speed 2015 */
{ R"(\\NFS16\.exe$)", {{
{ "dxgi.hideNvidiaGpu", "False" },
Expand Down
Loading