[d3d11] Remove old D3D11DeviceContext class

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 {
 

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 {

src/d3d10/d3d10_query.h

@@ -6,7 +6,6 @@ namespace dxvk {
 
   class D3D10Device;
   class D3D11Device;
-  class D3D11DeviceContext;
   class D3D11Query;
 
   class D3D10Query : public ID3D10Predicate {

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 {

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"

src/d3d11/d3d11_buffer.h

@@ -12,7 +12,6 @@
 namespace dxvk {
   
   class D3D11Device;
-  class D3D11DeviceContext;
 
 
   /**

src/d3d11/d3d11_cmdlist.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "d3d11_context.h"
+#include "d3d11_context_common.h"
 
 namespace dxvk {
   

src/d3d11/d3d11_context.cpp

@@ -1,24 +0,0 @@
-#include <cstring>
-
-#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<ID3D11DeviceContext4>(pParent) {
-
-  }
-  
-  
-  D3D11DeviceContext::~D3D11DeviceContext() {
-    
-  }
-  
-}

src/d3d11/d3d11_context.h

@@ -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<ID3D11DeviceContext4> {
-
-  public:
-
-    D3D11DeviceContext(
-            D3D11Device*            pParent);
-
-    ~D3D11DeviceContext();
-
-  };
-  
-}

src/d3d11/d3d11_context_common.cpp

@@ -9,7 +9,7 @@ namespace dxvk {
           D3D11Device*            pParent,
     const Rc<DxvkDevice>&         Device,
           DxvkCsChunkFlags        CsFlags)
-  : D3D11DeviceContext(pParent),
+  : D3D11DeviceChild<ID3D11DeviceContext4>(pParent),
     m_contextExt(GetTypedContext()),
     m_annotation(GetTypedContext(), Device),
     m_multithread(this, false),

src/d3d11/d3d11_context_common.h

@@ -3,8 +3,19 @@
 #include <type_traits>
 #include <vector>
 
+#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<typename ContextType>
-  class D3D11CommonContext : public D3D11DeviceContext {
+  class D3D11CommonContext : public D3D11DeviceChild<ID3D11DeviceContext4> {
     constexpr static bool IsDeferred = std::is_same_v<ContextType, D3D11DeferredContext>;
     using Forwarder = D3D11ContextObjectForwarder<IsDeferred>;
 

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;

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"
 

src/d3d11/d3d11_video.cpp

@@ -1,6 +1,5 @@
 #include <algorithm>
 
-#include "d3d11_context.h"
 #include "d3d11_context_imm.h"
 #include "d3d11_video.h"
 

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',