lee/renderdoc
1
0 Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-11-12 08:53:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unify Vulkan RenderState tracking in Loading & Replay: TraceRays APIs

Browse Source 
- Serialise_vkCmdTraceRaysKHR
- Serialise_vkCmdTraceRaysIndirectKHR
- Serialise_vkCmdTraceRaysIndirect2KHR
This commit is contained in:
Jake Turner committed 2026-11-11 12:40:50 +00:00
1 parent 3577e67bc1
commit 7fcf4bc413
1 file changed
+45 -60
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp
+45 -60
View File
@@ -4916,37 +4916,31 @@ bool WrappedVulkan::Serialise_vkCmdTraceRaysKHR(
{
m_LastCmdBufferID = GetResID(commandBuffer);
if(IsActiveReplaying(m_State))
if(InRerecordRange(m_LastCmdBufferID))
{
if(InRerecordRange(m_LastCmdBufferID))
{
bool loading = IsLoading(m_State);
if(!loading)
commandBuffer = RerecordCmdBuf(m_LastCmdBufferID);
uint32_t eventId = HandlePreCallback(commandBuffer, ActionFlags::DispatchRay);
uint32_t eventId =
!loading ? HandlePreCallback(commandBuffer, ActionFlags(ActionFlags::DispatchRay)) : 0;
ObjDisp(commandBuffer)
->CmdTraceRaysKHR(Unwrap(commandBuffer), &RaygenShaderBindingTable,
&MissShaderBindingTable, &HitShaderBindingTable,
&CallableShaderBindingTable, width, height, depth);
if(eventId && m_ActionCallback->PostDispatch(eventId, ActionFlags::DispatchRay, commandBuffer))
{
ObjDisp(commandBuffer)
->CmdTraceRaysKHR(Unwrap(commandBuffer), &RaygenShaderBindingTable,
&MissShaderBindingTable, &HitShaderBindingTable,
&CallableShaderBindingTable, width, height, depth);
m_ActionCallback->PostRemisc(eventId, ActionFlags::Clear, commandBuffer);
}
}
}
else
{
ObjDisp(commandBuffer)
->CmdTraceRaysKHR(Unwrap(commandBuffer), &RaygenShaderBindingTable,
&MissShaderBindingTable, &HitShaderBindingTable,
&CallableShaderBindingTable, width, height, depth);
if(eventId && m_ActionCallback->PostDispatch(eventId, ActionFlags::DispatchRay, commandBuffer))
{
ObjDisp(commandBuffer)
->CmdTraceRaysKHR(Unwrap(commandBuffer), &RaygenShaderBindingTable,
&MissShaderBindingTable, &HitShaderBindingTable,
&CallableShaderBindingTable, width, height, depth);
m_ActionCallback->PostRemisc(eventId, ActionFlags::Clear, commandBuffer);
}
if(loading)
{
AddEvent();
@@ -5020,37 +5014,31 @@ bool WrappedVulkan::Serialise_vkCmdTraceRaysIndirectKHR(
{
m_LastCmdBufferID = GetResID(commandBuffer);
if(IsActiveReplaying(m_State))
if(InRerecordRange(m_LastCmdBufferID))
{
if(InRerecordRange(m_LastCmdBufferID))
{
bool loading = IsLoading(m_State);
if(!loading)
commandBuffer = RerecordCmdBuf(m_LastCmdBufferID);
uint32_t eventId = HandlePreCallback(commandBuffer, ActionFlags::DispatchRay);
uint32_t eventId =
!loading ? HandlePreCallback(commandBuffer, ActionFlags(ActionFlags::DispatchRay)) : 0;
ObjDisp(commandBuffer)
->CmdTraceRaysIndirectKHR(Unwrap(commandBuffer), &RaygenShaderBindingTable,
&MissShaderBindingTable, &HitShaderBindingTable,
&CallableShaderBindingTable, indirectDeviceAddress);
if(eventId && m_ActionCallback->PostDispatch(eventId, ActionFlags::DispatchRay, commandBuffer))
{
ObjDisp(commandBuffer)
->CmdTraceRaysIndirectKHR(Unwrap(commandBuffer), &RaygenShaderBindingTable,
&MissShaderBindingTable, &HitShaderBindingTable,
&CallableShaderBindingTable, indirectDeviceAddress);
m_ActionCallback->PostRemisc(eventId, ActionFlags::Clear, commandBuffer);
}
}
}
else
{
ObjDisp(commandBuffer)
->CmdTraceRaysIndirectKHR(Unwrap(commandBuffer), &RaygenShaderBindingTable,
&MissShaderBindingTable, &HitShaderBindingTable,
&CallableShaderBindingTable, indirectDeviceAddress);
if(eventId && m_ActionCallback->PostDispatch(eventId, ActionFlags::DispatchRay, commandBuffer))
{
ObjDisp(commandBuffer)
->CmdTraceRaysIndirectKHR(Unwrap(commandBuffer), &RaygenShaderBindingTable,
&MissShaderBindingTable, &HitShaderBindingTable,
&CallableShaderBindingTable, indirectDeviceAddress);
m_ActionCallback->PostRemisc(eventId, ActionFlags::Clear, commandBuffer);
}
if(loading)
{
AddEvent();
@@ -5114,28 +5102,25 @@ bool WrappedVulkan::Serialise_vkCmdTraceRaysIndirect2KHR(SerialiserType &ser,
{
m_LastCmdBufferID = GetResID(commandBuffer);
if(IsActiveReplaying(m_State))
if(InRerecordRange(m_LastCmdBufferID))
{
if(InRerecordRange(m_LastCmdBufferID))
{
bool loading = IsLoading(m_State);
if(!loading)
commandBuffer = RerecordCmdBuf(m_LastCmdBufferID);
uint32_t eventId = HandlePreCallback(commandBuffer, ActionFlags::DispatchRay);
uint32_t eventId =
!loading ? HandlePreCallback(commandBuffer, ActionFlags(ActionFlags::DispatchRay)) : 0;
ObjDisp(commandBuffer)->CmdTraceRaysIndirect2KHR(Unwrap(commandBuffer), indirectDeviceAddress);
if(eventId && m_ActionCallback->PostDispatch(eventId, ActionFlags::DispatchRay, commandBuffer))
{
ObjDisp(commandBuffer)->CmdTraceRaysIndirect2KHR(Unwrap(commandBuffer), indirectDeviceAddress);
m_ActionCallback->PostRemisc(eventId, ActionFlags::Clear, commandBuffer);
}
}
}
else
{
ObjDisp(commandBuffer)->CmdTraceRaysIndirect2KHR(Unwrap(commandBuffer), indirectDeviceAddress);
if(eventId && m_ActionCallback->PostDispatch(eventId, ActionFlags::DispatchRay, commandBuffer))
{
ObjDisp(commandBuffer)->CmdTraceRaysIndirect2KHR(Unwrap(commandBuffer), indirectDeviceAddress);
m_ActionCallback->PostRemisc(eventId, ActionFlags::Clear, commandBuffer);
}
if(loading)
{
AddEvent();