From 8108516b56645042bce710f1fd836dce48a12d36 Mon Sep 17 00:00:00 2001
From: Jovan Ristic <jristic42@gmail.com>
Date: Mon, 12 Feb 2024 14:10:06 -0800
Subject: [PATCH] D3D12 Pixel History handle resolve events.

* Add action callbacks for ResolveSubresource so pixel history can
record pre- and post-mods for the events.
---
 renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
index c57fa4c99..cb4d66401 100644
--- a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
+++ b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
@@ -5098,8 +5098,15 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ResolveSubresource(
       if(m_Cmd->InRerecordRange(m_Cmd->m_LastCmdListID))
       {
         ID3D12GraphicsCommandListX *list = m_Cmd->RerecordCmdList(m_Cmd->m_LastCmdListID);
+        uint32_t eventId = m_Cmd->HandlePreCallback(list, ActionFlags::Resolve);
         Unwrap(list)->ResolveSubresource(Unwrap(pDstResource), DstSubresource, Unwrap(pSrcResource),
                                          SrcSubresource, Format);
+        if(eventId && m_Cmd->m_ActionCallback->PostMisc(eventId, ActionFlags::Resolve, list))
+        {
+          Unwrap(list)->ResolveSubresource(Unwrap(pDstResource), DstSubresource,
+                                           Unwrap(pSrcResource), SrcSubresource, Format);
+          m_Cmd->m_ActionCallback->PostRemisc(eventId, ActionFlags::Resolve, list);
+        }
       }
     }
     else