D3D12 EI ActionCallback replay don't generate negative argidx

Zorro666 · Zorro666 · commit ccc2a5023a55 · 2026-04-14T17:28:55.000+01:00
For an EI with a single argument then curEID == baseEventID because the fake push/pop markers are not present
diff --git a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
@@ -4420,7 +4420,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ExecuteIndirect(
 
           if(m_Cmd->m_FirstEventID > 1)
           {
-            const uint32_t argidx = (curEID - baseEventID - 1);
+            const uint32_t argidx = (curEID > baseEventID) ? (curEID - baseEventID - 1) : 0;
             const uint32_t execidx = argidx / comSig->sig.arguments.count();
 
             argOffset += comSig->sig.ByteStride * execidx;
@@ -4516,7 +4516,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ExecuteIndirect(
           }
           else
           {
-            const uint32_t argidx = (curEID - baseEventID - 1);
+            const uint32_t argidx = (curEID > baseEventID) ? (curEID - baseEventID - 1) : 0;
             const uint32_t execidx = argidx / comSig->sig.arguments.count();
 
             // don't do anything when selecting the final popmarker as well - everything will have

Original file line number	Diff line number	Diff line change
`@@ -4420,7 +4420,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ExecuteIndirect(`
`4420`	`4420`
`4421`	`4421`	`if(m_Cmd->m_FirstEventID > 1)`
`4422`	`4422`	`{`
`4423`		`- const uint32_t argidx = (curEID - baseEventID - 1);`
	`4423`	`+ const uint32_t argidx = (curEID > baseEventID) ? (curEID - baseEventID - 1) : 0;`
`4424`	`4424`	`const uint32_t execidx = argidx / comSig->sig.arguments.count();`
`4425`	`4425`
`4426`	`4426`	`argOffset += comSig->sig.ByteStride * execidx;`
`@@ -4516,7 +4516,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ExecuteIndirect(`
`4516`	`4516`	`}`
`4517`	`4517`	`else`
`4518`	`4518`	`{`
`4519`		`- const uint32_t argidx = (curEID - baseEventID - 1);`
	`4519`	`+ const uint32_t argidx = (curEID > baseEventID) ? (curEID - baseEventID - 1) : 0;`
`4520`	`4520`	`const uint32_t execidx = argidx / comSig->sig.arguments.count();`
`4521`	`4521`
`4522`	`4522`	`// don't do anything when selecting the final popmarker as well - everything will have`