From 0423ca48709c42ddc85d7ced8e51bdef0bd1e271 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 19 Aug 2025 15:36:28 +0100
Subject: [PATCH] Ensure when using action callbacks that sub-EIs are selected
 correctly

---
 renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
index 3f0dc4392..802973f8f 100644
--- a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
+++ b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
@@ -4247,6 +4247,14 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ExecuteIndirect(
 
           countToReplay = RDCMIN(countToReplay, maxCommands);
 
+          if(m_Cmd->m_FirstEventID > 1)
+          {
+            const uint32_t argidx = (curEID - baseEventID - 1);
+            const uint32_t execidx = argidx / comSig->sig.arguments.count();
+
+            argOffset += comSig->sig.ByteStride * execidx;
+          }
+
           for(uint32_t i = 0; i < countToReplay; i++)
           {
             ActionFlags drawType =