From 00b07693a626a0323976343f5e4e0a8e80b7cb4e Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 24 Jun 2024 17:09:06 +0100
Subject: [PATCH] Treat ray dispatches as dispatches for action callbacks

---
 renderdoc/driver/d3d12/d3d12_command_list4_wrap.cpp | 4 ++--
 renderdoc/driver/d3d12/d3d12_commands.cpp           | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/renderdoc/driver/d3d12/d3d12_command_list4_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list4_wrap.cpp
index 4a3e6e973..9a067b4dc 100644
--- a/renderdoc/driver/d3d12/d3d12_command_list4_wrap.cpp
+++ b/renderdoc/driver/d3d12/d3d12_command_list4_wrap.cpp
@@ -1494,10 +1494,10 @@ bool WrappedID3D12GraphicsCommandList::Serialise_DispatchRays(SerialiserType &se
 
         uint32_t eventId = m_Cmd->HandlePreCallback(list, ActionFlags::DispatchRay);
         Unwrap4(list)->DispatchRays(&patchedDispatch.desc);
-        if(eventId && m_Cmd->m_ActionCallback->PostDraw(eventId, list))
+        if(eventId && m_Cmd->m_ActionCallback->PostDispatch(eventId, list))
         {
           Unwrap4(list)->DispatchRays(&patchedDispatch.desc);
-          m_Cmd->m_ActionCallback->PostRedraw(eventId, list);
+          m_Cmd->m_ActionCallback->PostRedispatch(eventId, list);
         }
       }
     }
diff --git a/renderdoc/driver/d3d12/d3d12_commands.cpp b/renderdoc/driver/d3d12/d3d12_commands.cpp
index 9b8c55f0c..afe011247 100644
--- a/renderdoc/driver/d3d12/d3d12_commands.cpp
+++ b/renderdoc/driver/d3d12/d3d12_commands.cpp
@@ -1828,6 +1828,7 @@ uint32_t D3D12CommandData::HandlePreCallback(ID3D12GraphicsCommandListX *list, A
       break;
     }
     case ActionFlags::Dispatch:
+    case ActionFlags::DispatchRay:
     {
       m_ActionCallback->PreDispatch(eventId, list);
       break;