From 42e1ecef5f5e6f8ce41c519735e42a7608a5c1a0 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 21 May 2025 22:41:49 +0100 Subject: [PATCH] Ensure unformatted internal details aren't displayed for RT calls --- .../driver/vulkan/wrappers/vk_cmd_funcs.cpp | 32 +++++++++---------- .../driver/vulkan/wrappers/vk_draw_funcs.cpp | 26 +++++++-------- .../vulkan/wrappers/vk_resource_funcs.cpp | 4 +-- .../vulkan/wrappers/vk_shader_funcs.cpp | 8 ++--- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp index 26dd307b5..7ee38fbd0 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp @@ -7924,10 +7924,10 @@ bool WrappedVulkan::Serialise_vkCmdBuildAccelerationStructuresIndirectKHR( const uint32_t *const *ppMaxPrimitiveCounts) { SERIALISE_ELEMENT(commandBuffer); - SERIALISE_ELEMENT(infoCount).Important(); - SERIALISE_ELEMENT_ARRAY(pInfos, infoCount); - SERIALISE_ELEMENT_ARRAY(pIndirectDeviceAddresses, infoCount); - SERIALISE_ELEMENT_ARRAY(pIndirectStrides, infoCount); + SERIALISE_ELEMENT(infoCount).Hidden(); + SERIALISE_ELEMENT_ARRAY(pInfos, infoCount).Hidden(); + SERIALISE_ELEMENT_ARRAY(pIndirectDeviceAddresses, infoCount).Hidden(); + SERIALISE_ELEMENT_ARRAY(pIndirectStrides, infoCount).Hidden(); // Convert the array of arrays for easier serialisation rdcarray> maxPrimitives; @@ -7939,7 +7939,7 @@ bool WrappedVulkan::Serialise_vkCmdBuildAccelerationStructuresIndirectKHR( maxPrimitives.emplace_back(ppMaxPrimitiveCounts[i], pInfos[i].geometryCount); } - SERIALISE_ELEMENT(maxPrimitives); + SERIALISE_ELEMENT(maxPrimitives).Hidden(); SERIALISE_CHECK_READ_ERRORS(); @@ -8042,8 +8042,8 @@ bool WrappedVulkan::Serialise_vkCmdBuildAccelerationStructuresKHR( const VkAccelerationStructureBuildRangeInfoKHR *const *ppBuildRangeInfos) { SERIALISE_ELEMENT(commandBuffer); - SERIALISE_ELEMENT(infoCount).Important(); - SERIALISE_ELEMENT_ARRAY(pInfos, infoCount); + SERIALISE_ELEMENT(infoCount).Hidden(); + SERIALISE_ELEMENT_ARRAY(pInfos, infoCount).Hidden(); // Convert the array of arrays for easier serialisation rdcarray> rangeInfos; @@ -8055,7 +8055,7 @@ bool WrappedVulkan::Serialise_vkCmdBuildAccelerationStructuresKHR( rangeInfos.emplace_back(ppBuildRangeInfos[i], pInfos[i].geometryCount); } - SERIALISE_ELEMENT(rangeInfos); + SERIALISE_ELEMENT(rangeInfos).Hidden(); SERIALISE_CHECK_READ_ERRORS(); @@ -8183,7 +8183,7 @@ bool WrappedVulkan::Serialise_vkCmdCopyAccelerationStructureKHR( const VkCopyAccelerationStructureInfoKHR *pInfo) { SERIALISE_ELEMENT(commandBuffer); - SERIALISE_ELEMENT_LOCAL(Info, *pInfo); + SERIALISE_ELEMENT_LOCAL(Info, *pInfo).Hidden(); SERIALISE_CHECK_READ_ERRORS(); @@ -8263,7 +8263,7 @@ bool WrappedVulkan::Serialise_vkCmdCopyAccelerationStructureToMemoryKHR( const VkCopyAccelerationStructureToMemoryInfoKHR *pInfo) { SERIALISE_ELEMENT(commandBuffer); - SERIALISE_ELEMENT_LOCAL(Info, *pInfo); + SERIALISE_ELEMENT_LOCAL(Info, *pInfo).Hidden(); SERIALISE_CHECK_READ_ERRORS(); @@ -8290,7 +8290,7 @@ bool WrappedVulkan::Serialise_vkCmdCopyMemoryToAccelerationStructureKHR( const VkCopyMemoryToAccelerationStructureInfoKHR *pInfo) { SERIALISE_ELEMENT(commandBuffer); - SERIALISE_ELEMENT_LOCAL(Info, *pInfo); + SERIALISE_ELEMENT_LOCAL(Info, *pInfo).Hidden(); SERIALISE_CHECK_READ_ERRORS(); @@ -8356,11 +8356,11 @@ bool WrappedVulkan::Serialise_vkCmdWriteAccelerationStructuresPropertiesKHR( VkQueryPool queryPool, uint32_t firstQuery) { SERIALISE_ELEMENT(commandBuffer); - SERIALISE_ELEMENT(accelerationStructureCount); - SERIALISE_ELEMENT_ARRAY(pAccelerationStructures, accelerationStructureCount); - SERIALISE_ELEMENT(queryType).Important(); - SERIALISE_ELEMENT(queryPool).Important(); - SERIALISE_ELEMENT(firstQuery); + SERIALISE_ELEMENT(accelerationStructureCount).Hidden(); + SERIALISE_ELEMENT_ARRAY(pAccelerationStructures, accelerationStructureCount).Hidden(); + SERIALISE_ELEMENT(queryType).Hidden(); + SERIALISE_ELEMENT(queryPool).Hidden(); + SERIALISE_ELEMENT(firstQuery).Hidden(); SERIALISE_CHECK_READ_ERRORS(); diff --git a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp index d79c43934..74fbeb592 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp @@ -5228,13 +5228,13 @@ bool WrappedVulkan::Serialise_vkCmdTraceRaysKHR( uint32_t height, uint32_t depth) { SERIALISE_ELEMENT(commandBuffer); - SERIALISE_ELEMENT_LOCAL(RaygenShaderBindingTable, *pRaygenShaderBindingTable); - SERIALISE_ELEMENT_LOCAL(MissShaderBindingTable, *pMissShaderBindingTable); - SERIALISE_ELEMENT_LOCAL(HitShaderBindingTable, *pHitShaderBindingTable); - SERIALISE_ELEMENT_LOCAL(CallableShaderBindingTable, *pCallableShaderBindingTable); - SERIALISE_ELEMENT(width).Important(); - SERIALISE_ELEMENT(height).Important(); - SERIALISE_ELEMENT(depth).Important(); + SERIALISE_ELEMENT_LOCAL(RaygenShaderBindingTable, *pRaygenShaderBindingTable).Hidden(); + SERIALISE_ELEMENT_LOCAL(MissShaderBindingTable, *pMissShaderBindingTable).Hidden(); + SERIALISE_ELEMENT_LOCAL(HitShaderBindingTable, *pHitShaderBindingTable).Hidden(); + SERIALISE_ELEMENT_LOCAL(CallableShaderBindingTable, *pCallableShaderBindingTable).Hidden(); + SERIALISE_ELEMENT(width).Hidden(); + SERIALISE_ELEMENT(height).Hidden(); + SERIALISE_ELEMENT(depth).Hidden(); Serialise_DebugMessages(ser); @@ -5334,11 +5334,11 @@ bool WrappedVulkan::Serialise_vkCmdTraceRaysIndirectKHR( VkDeviceAddress indirectDeviceAddress) { SERIALISE_ELEMENT(commandBuffer); - SERIALISE_ELEMENT_LOCAL(RaygenShaderBindingTable, *pRaygenShaderBindingTable); - SERIALISE_ELEMENT_LOCAL(MissShaderBindingTable, *pMissShaderBindingTable); - SERIALISE_ELEMENT_LOCAL(HitShaderBindingTable, *pHitShaderBindingTable); - SERIALISE_ELEMENT_LOCAL(CallableShaderBindingTable, *pCallableShaderBindingTable); - SERIALISE_ELEMENT(indirectDeviceAddress).Important(); + SERIALISE_ELEMENT_LOCAL(RaygenShaderBindingTable, *pRaygenShaderBindingTable).Hidden(); + SERIALISE_ELEMENT_LOCAL(MissShaderBindingTable, *pMissShaderBindingTable).Hidden(); + SERIALISE_ELEMENT_LOCAL(HitShaderBindingTable, *pHitShaderBindingTable).Hidden(); + SERIALISE_ELEMENT_LOCAL(CallableShaderBindingTable, *pCallableShaderBindingTable).Hidden(); + SERIALISE_ELEMENT(indirectDeviceAddress).Hidden(); Serialise_DebugMessages(ser); @@ -5432,7 +5432,7 @@ bool WrappedVulkan::Serialise_vkCmdTraceRaysIndirect2KHR(SerialiserType &ser, VkDeviceAddress indirectDeviceAddress) { SERIALISE_ELEMENT(commandBuffer); - SERIALISE_ELEMENT(indirectDeviceAddress).Important(); + SERIALISE_ELEMENT(indirectDeviceAddress).Hidden(); Serialise_DebugMessages(ser); diff --git a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp index c496e63ae..1f0b0a32e 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp @@ -3456,8 +3456,8 @@ bool WrappedVulkan::Serialise_vkCreateAccelerationStructureKHR( const VkAllocationCallbacks *pAllocator, VkAccelerationStructureKHR *pAccelerationStructure) { SERIALISE_ELEMENT(device); - SERIALISE_ELEMENT_LOCAL(CreateInfo, *pCreateInfo).Important(); - SERIALISE_ELEMENT_OPT(pAllocator); + SERIALISE_ELEMENT_LOCAL(CreateInfo, *pCreateInfo).Hidden(); + SERIALISE_ELEMENT_OPT(pAllocator).Hidden(); SERIALISE_ELEMENT_LOCAL(AccelerationStructure, GetResID(*pAccelerationStructure)) .TypedAs("VkAccelerationStructureKHR"_lit); diff --git a/renderdoc/driver/vulkan/wrappers/vk_shader_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_shader_funcs.cpp index 507119cf3..35779663f 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_shader_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_shader_funcs.cpp @@ -1287,10 +1287,10 @@ bool WrappedVulkan::Serialise_vkCreateRayTracingPipelinesKHR( VkPipeline *pPipelines) { SERIALISE_ELEMENT(device); - SERIALISE_ELEMENT(pipelineCache); - SERIALISE_ELEMENT(createInfoCount); - SERIALISE_ELEMENT_LOCAL(CreateInfo, *pCreateInfos).Important(); - SERIALISE_ELEMENT_OPT(pAllocator); + SERIALISE_ELEMENT(pipelineCache).Hidden(); + SERIALISE_ELEMENT(createInfoCount).Hidden(); + SERIALISE_ELEMENT_LOCAL(CreateInfo, *pCreateInfos).Hidden(); + SERIALISE_ELEMENT_OPT(pAllocator).Hidden(); SERIALISE_ELEMENT_LOCAL(Pipeline, GetResID(*pPipelines)).TypedAs("VkPipeline"_lit); uint32_t captureReplayHandleSize = 0;