Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/doitsujin/dxvk.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Ashton <joshua@froggi.es>2022-09-16 13:08:40 +0300
committerJoshua Ashton <joshua@froggi.es>2022-09-16 13:24:35 +0300
commit6e860262c533e576014561b50876e9a4be211657 (patch)
tree79e69b3695808e6bba04649e78db5a5edb82a9f4
parent79c7a72f89a1f0de46df217a1e8b61d1efca7516 (diff)
[d3d11] Store D3D11DeviceContextState as private refminor-ref-shit
Avoids a circular dependency
-rw-r--r--src/d3d11/d3d11_context_imm.cpp4
-rw-r--r--src/d3d11/d3d11_context_imm.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/d3d11/d3d11_context_imm.cpp b/src/d3d11/d3d11_context_imm.cpp
index f5e43662..1558ce6f 100644
--- a/src/d3d11/d3d11_context_imm.cpp
+++ b/src/d3d11/d3d11_context_imm.cpp
@@ -743,8 +743,8 @@ namespace dxvk {
// Reset all state affected by the current context state
ResetCommandListState();
- Com<D3D11DeviceContextState> oldState = std::move(m_stateObject);
- Com<D3D11DeviceContextState> newState = static_cast<D3D11DeviceContextState*>(pState);
+ Com<D3D11DeviceContextState, false> oldState = std::move(m_stateObject);
+ Com<D3D11DeviceContextState, false> newState = static_cast<D3D11DeviceContextState*>(pState);
if (oldState == nullptr)
oldState = new D3D11DeviceContextState(m_parent);
diff --git a/src/d3d11/d3d11_context_imm.h b/src/d3d11/d3d11_context_imm.h
index b00a8111..49872be2 100644
--- a/src/d3d11/d3d11_context_imm.h
+++ b/src/d3d11/d3d11_context_imm.h
@@ -101,7 +101,8 @@ namespace dxvk {
D3D10Multithread m_multithread;
D3D11VideoContext m_videoContext;
- Com<D3D11DeviceContextState> m_stateObject;
+
+ Com<D3D11DeviceContextState, false> m_stateObject;
HRESULT MapBuffer(
D3D11Buffer* pResource,