Improve deferred mode state tracking performance and correctness

SpecialKO · Nov 29, 2024 · 6f7052f · 6f7052f
1 parent 8d793d8
commit 6f7052f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -3,6 +3,8 @@
  + Ensure that "LowSpecMode" is enabled even for Metaphor: ReFantazio users with
      texture mods installer, and change the auto-disable feature to only apply
        when staging texture cache is enabled.
+ + Disable deferred context isolation in Metaphor by default for performance,
+     re-enable it if you need live texture modding or hudless screenshots.
  + Improved thread interlocking for XInput rumble
 
 24.11.29.3

diff --git a/include/SpecialK/render/d3d11/d3d11_core.h b/include/SpecialK/render/d3d11/d3d11_core.h
@@ -236,7 +236,7 @@ SK_D3D11_ResetContextState ( ID3D11DeviceContext *pDevCtx,
 extern std::pair <BOOL*, BOOL>
 SK_ImGui_FlagDrawing_OnD3D11Ctx (UINT dev_idx);
 extern bool
-SK_ImGui_IsDrawing_OnD3D11Ctx   (UINT dev_idx, ID3D11DeviceContext* pDevCtx);
+SK_ImGui_IsDrawing_OnD3D11Ctx   (UINT& dev_idx, ID3D11DeviceContext* pDevCtx);
 
 
 struct shader_stage_s
@@ -2891,7 +2891,7 @@ struct SK_IMGUI_D3D11StateBlock {
 };
 
 extern std::pair <BOOL*, BOOL> SK_ImGui_FlagDrawing_OnD3D11Ctx (UINT dev_idx);
-extern bool                    SK_ImGui_IsDrawing_OnD3D11Ctx   (UINT dev_idx, ID3D11DeviceContext* pDevCtx);
+extern bool                    SK_ImGui_IsDrawing_OnD3D11Ctx   (UINT& dev_idx, ID3D11DeviceContext* pDevCtx);
 
 void SK_D3D11_InitMutexes (void);
 BOOL SK_D3D11_SetWrappedImmediateContext ( ID3D11Device        *pDev,

diff --git a/src/render/d3d11/d3d11.cpp b/src/render/d3d11/d3d11.cpp
@@ -2993,8 +2993,10 @@ SK_D3D11_DrawHandler ( ID3D11DeviceContext  *pDevCtx,
                        SK_D3D11DrawType      draw_type,
                        UINT                  num_verts,
                        SK_TLS              **ppTLS   = nullptr,
-                       UINT&                 dev_idx = NegativeOne )
+                       UINT&                _dev_idx = NegativeOne )
 {
+  UINT dev_idx = _dev_idx;
+
   std::ignore = draw_type;
   std::ignore = num_verts;
 
@@ -3036,18 +3038,20 @@ SK_D3D11_DrawHandler ( ID3D11DeviceContext  *pDevCtx,
 
   ///if (SK_D3D11_IsDevCtxDeferred (pDevCtx))
   ///  return false;
+  /// 
 
   dev_idx = ( dev_idx == NegativeOne ? SK_D3D11_GetDeviceContextHandle (pDevCtx)
             : dev_idx );
 
+  if (&_dev_idx != &NegativeOne)
+    _dev_idx = dev_idx;
+
   // ImGui gets to pass-through without invoking the hook
   if (SK_ImGui_IsDrawing_OnD3D11Ctx (dev_idx, pDevCtx))
   {
     return Normal;
   }
 
-  std::scoped_lock <SK_Thread_HybridSpinlock> shader_lock (*cs_render_view);
-
   using _Registry =
     SK_D3D11_KnownShaders::ShaderRegistry <IUnknown>*;
 
@@ -3161,6 +3165,8 @@ const
 
   if (SK_D3D11_EnableTracking)
   {
+    std::scoped_lock <SK_Thread_HybridSpinlock> shader_lock (*cs_render_view);
+
     SK_D3D11_DrawThreads->mark ();
 
     bool rtv_active = false;
@@ -3209,8 +3215,6 @@ const
 
   for ( auto* tracker : trackers )
   {
-    std::scoped_lock <SK_Thread_HybridSpinlock> tracker_lock (*cs_render_view);
-
     const bool active =
       tracker->active.get (dev_idx);
 
@@ -9253,8 +9257,6 @@ D3D11Dev_GetImmediateContext3_Override (
 void
 SK_D3D11_EndFrame (SK_TLS* pTLS)
 {
-  std::scoped_lock <SK_Thread_HybridSpinlock> auto_lock2 (*cs_render_view);
-
   for ( auto end_frame_fn : plugin_mgr->end_frame_fns )
   {
     end_frame_fn ();
@@ -9277,6 +9279,8 @@ SK_D3D11_EndFrame (SK_TLS* pTLS)
     return;
   }
 
+  std::scoped_lock <SK_Thread_HybridSpinlock> auto_lock2 (*cs_render_view);
+
   const SK_RenderBackend& rb =
     SK_GetCurrentRenderBackend ();
 

diff --git a/src/render/d3d11/d3d11_state_tracker.cpp b/src/render/d3d11/d3d11_state_tracker.cpp
@@ -64,7 +64,7 @@ volatile LONG
      SK_D3D11_CBufferTrackingReqs = 0L;
 
 bool
-SK_ImGui_IsDrawing_OnD3D11Ctx (UINT dev_idx, ID3D11DeviceContext* pDevCtx)
+SK_ImGui_IsDrawing_OnD3D11Ctx (UINT& dev_idx, ID3D11DeviceContext* pDevCtx)
 {
   if (pDevCtx == nullptr || dev_idx == UINT_MAX)
   {