From 30b1cac0ae67a072b7825dfcbe161b7033115067 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Wed, 3 Aug 2022 21:35:59 +0200 Subject: [PATCH] [d3d11] Remove old D3D11DeviceContext class --- src/d3d10/d3d10_buffer.cpp | 2 +- src/d3d10/d3d10_query.cpp | 2 +- src/d3d10/d3d10_query.h | 1 - src/d3d10/d3d10_texture.cpp | 2 +- src/d3d11/d3d11_buffer.cpp | 2 +- src/d3d11/d3d11_buffer.h | 1 - src/d3d11/d3d11_cmdlist.h | 2 +- src/d3d11/d3d11_context.cpp | 24 ---------------------- src/d3d11/d3d11_context.h | 32 ------------------------------ src/d3d11/d3d11_context_common.cpp | 2 +- src/d3d11/d3d11_context_common.h | 15 ++++++++++++-- src/d3d11/d3d11_device.h | 1 - src/d3d11/d3d11_gdi.cpp | 2 +- src/d3d11/d3d11_video.cpp | 1 - src/d3d11/meson.build | 1 - 15 files changed, 20 insertions(+), 70 deletions(-) delete mode 100644 src/d3d11/d3d11_context.cpp delete mode 100644 src/d3d11/d3d11_context.h diff --git a/src/d3d10/d3d10_buffer.cpp b/src/d3d10/d3d10_buffer.cpp index 2bd089b0..bf08aadf 100644 --- a/src/d3d10/d3d10_buffer.cpp +++ b/src/d3d10/d3d10_buffer.cpp @@ -2,7 +2,7 @@ #include "../d3d11/d3d11_buffer.h" #include "../d3d11/d3d11_device.h" -#include "../d3d11/d3d11_context.h" +#include "../d3d11/d3d11_context_common.h" namespace dxvk { diff --git a/src/d3d10/d3d10_query.cpp b/src/d3d10/d3d10_query.cpp index 8730a611..bb536c0d 100644 --- a/src/d3d10/d3d10_query.cpp +++ b/src/d3d10/d3d10_query.cpp @@ -2,7 +2,7 @@ #include "d3d10_device.h" #include "../d3d11/d3d11_device.h" -#include "../d3d11/d3d11_context.h" +#include "../d3d11/d3d11_context_common.h" #include "../d3d11/d3d11_query.h" namespace dxvk { diff --git a/src/d3d10/d3d10_query.h b/src/d3d10/d3d10_query.h index c189e979..699caa4e 100644 --- a/src/d3d10/d3d10_query.h +++ b/src/d3d10/d3d10_query.h @@ -6,7 +6,6 @@ namespace dxvk { class D3D10Device; class D3D11Device; - class D3D11DeviceContext; class D3D11Query; class D3D10Query : public ID3D10Predicate { diff --git a/src/d3d10/d3d10_texture.cpp b/src/d3d10/d3d10_texture.cpp index d04267cb..1a852a0c 100644 --- a/src/d3d10/d3d10_texture.cpp +++ b/src/d3d10/d3d10_texture.cpp @@ -2,7 +2,7 @@ #include "d3d10_device.h" #include "../d3d11/d3d11_device.h" -#include "../d3d11/d3d11_context.h" +#include "../d3d11/d3d11_context_common.h" #include "../d3d11/d3d11_texture.h" namespace dxvk { diff --git a/src/d3d11/d3d11_buffer.cpp b/src/d3d11/d3d11_buffer.cpp index c53003a0..d248e342 100644 --- a/src/d3d11/d3d11_buffer.cpp +++ b/src/d3d11/d3d11_buffer.cpp @@ -1,5 +1,5 @@ #include "d3d11_buffer.h" -#include "d3d11_context.h" +#include "d3d11_context_common.h" #include "d3d11_device.h" #include "../dxvk/dxvk_data.h" diff --git a/src/d3d11/d3d11_buffer.h b/src/d3d11/d3d11_buffer.h index c0472fd6..d59c547c 100644 --- a/src/d3d11/d3d11_buffer.h +++ b/src/d3d11/d3d11_buffer.h @@ -12,7 +12,6 @@ namespace dxvk { class D3D11Device; - class D3D11DeviceContext; /** diff --git a/src/d3d11/d3d11_cmdlist.h b/src/d3d11/d3d11_cmdlist.h index 8be313ad..c3397258 100644 --- a/src/d3d11/d3d11_cmdlist.h +++ b/src/d3d11/d3d11_cmdlist.h @@ -1,6 +1,6 @@ #pragma once -#include "d3d11_context.h" +#include "d3d11_context_common.h" namespace dxvk { diff --git a/src/d3d11/d3d11_context.cpp b/src/d3d11/d3d11_context.cpp deleted file mode 100644 index 4e13dca8..00000000 --- a/src/d3d11/d3d11_context.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include - -#include "d3d11_context.h" -#include "d3d11_device.h" -#include "d3d11_query.h" -#include "d3d11_texture.h" -#include "d3d11_video.h" - -#include "../dxbc/dxbc_util.h" - -namespace dxvk { - - D3D11DeviceContext::D3D11DeviceContext( - D3D11Device* pParent) - : D3D11DeviceChild(pParent) { - - } - - - D3D11DeviceContext::~D3D11DeviceContext() { - - } - -} diff --git a/src/d3d11/d3d11_context.h b/src/d3d11/d3d11_context.h deleted file mode 100644 index f884ac39..00000000 --- a/src/d3d11/d3d11_context.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include "../dxvk/dxvk_adapter.h" -#include "../dxvk/dxvk_cs.h" -#include "../dxvk/dxvk_device.h" -#include "../dxvk/dxvk_staging.h" - -#include "../d3d10/d3d10_multithread.h" - -#include "d3d11_annotation.h" -#include "d3d11_cmd.h" -#include "d3d11_context_ext.h" -#include "d3d11_context_state.h" -#include "d3d11_device_child.h" -#include "d3d11_texture.h" - -namespace dxvk { - - class D3D11Device; - - class D3D11DeviceContext : public D3D11DeviceChild { - - public: - - D3D11DeviceContext( - D3D11Device* pParent); - - ~D3D11DeviceContext(); - - }; - -} diff --git a/src/d3d11/d3d11_context_common.cpp b/src/d3d11/d3d11_context_common.cpp index b4797c0e..1e333d4c 100644 --- a/src/d3d11/d3d11_context_common.cpp +++ b/src/d3d11/d3d11_context_common.cpp @@ -9,7 +9,7 @@ namespace dxvk { D3D11Device* pParent, const Rc& Device, DxvkCsChunkFlags CsFlags) - : D3D11DeviceContext(pParent), + : D3D11DeviceChild(pParent), m_contextExt(GetTypedContext()), m_annotation(GetTypedContext(), Device), m_multithread(this, false), diff --git a/src/d3d11/d3d11_context_common.h b/src/d3d11/d3d11_context_common.h index 5e6a0488..9974e900 100644 --- a/src/d3d11/d3d11_context_common.h +++ b/src/d3d11/d3d11_context_common.h @@ -3,8 +3,19 @@ #include #include +#include "../dxvk/dxvk_adapter.h" +#include "../dxvk/dxvk_cs.h" +#include "../dxvk/dxvk_device.h" +#include "../dxvk/dxvk_staging.h" + +#include "../d3d10/d3d10_multithread.h" + +#include "d3d11_annotation.h" #include "d3d11_buffer.h" -#include "d3d11_context.h" +#include "d3d11_cmd.h" +#include "d3d11_context_ext.h" +#include "d3d11_context_state.h" +#include "d3d11_device_child.h" #include "d3d11_texture.h" namespace dxvk { @@ -52,7 +63,7 @@ namespace dxvk { * having to use virtual methods. */ template - class D3D11CommonContext : public D3D11DeviceContext { + class D3D11CommonContext : public D3D11DeviceChild { constexpr static bool IsDeferred = std::is_same_v; using Forwarder = D3D11ContextObjectForwarder; diff --git a/src/d3d11/d3d11_device.h b/src/d3d11/d3d11_device.h index 5a99bd62..9317eac0 100644 --- a/src/d3d11/d3d11_device.h +++ b/src/d3d11/d3d11_device.h @@ -31,7 +31,6 @@ namespace dxvk { class D3D11CommonShader; class D3D11CommonTexture; class D3D11Counter; - class D3D11DeviceContext; class D3D11DXGIDevice; class D3D11ImmediateContext; class D3D11Predicate; diff --git a/src/d3d11/d3d11_gdi.cpp b/src/d3d11/d3d11_gdi.cpp index 0958886e..b4439fba 100644 --- a/src/d3d11/d3d11_gdi.cpp +++ b/src/d3d11/d3d11_gdi.cpp @@ -1,4 +1,4 @@ -#include "d3d11_context.h" +#include "d3d11_context_common.h" #include "d3d11_device.h" #include "d3d11_gdi.h" diff --git a/src/d3d11/d3d11_video.cpp b/src/d3d11/d3d11_video.cpp index 75dc373a..d79e1f27 100644 --- a/src/d3d11/d3d11_video.cpp +++ b/src/d3d11/d3d11_video.cpp @@ -1,6 +1,5 @@ #include -#include "d3d11_context.h" #include "d3d11_context_imm.h" #include "d3d11_video.h" diff --git a/src/d3d11/meson.build b/src/d3d11/meson.build index 4600a5a5..4d5f2e59 100644 --- a/src/d3d11/meson.build +++ b/src/d3d11/meson.build @@ -29,7 +29,6 @@ d3d11_src = [ 'd3d11_buffer.cpp', 'd3d11_class_linkage.cpp', 'd3d11_cmdlist.cpp', - 'd3d11_context.cpp', 'd3d11_context_common.cpp', 'd3d11_context_def.cpp', 'd3d11_context_ext.cpp',