diff --git a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp index 8c8ce49ba..c7ed25d07 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp @@ -10468,6 +10468,118 @@ void WrappedVulkan::vkCmdSetCheckpointNV(VkCommandBuffer commandBuffer, const vo } } +template +bool WrappedVulkan::Serialise_vkCmdBindIndexBuffer3KHR(SerialiserType &ser, + VkCommandBuffer commandBuffer, + const VkBindIndexBuffer3InfoKHR *pInfo) +{ + return true; +} + +void WrappedVulkan::vkCmdBindIndexBuffer3KHR(VkCommandBuffer commandBuffer, + const VkBindIndexBuffer3InfoKHR *pInfo) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdBindVertexBuffers3KHR( + SerialiserType &ser, VkCommandBuffer commandBuffer, uint32_t firstBinding, + uint32_t bindingCount, const VkBindVertexBuffer3InfoKHR *pBindingInfos) +{ + return true; +} + +void WrappedVulkan::vkCmdBindVertexBuffers3KHR(VkCommandBuffer commandBuffer, uint32_t firstBinding, + uint32_t bindingCount, + const VkBindVertexBuffer3InfoKHR *pBindingInfos) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdCopyQueryPoolResultsToMemoryKHR( + SerialiserType &ser, VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, + uint32_t queryCount, const VkStridedDeviceAddressRangeKHR *pDstRange, + VkAddressCommandFlagsKHR dstFlags, VkQueryResultFlags queryResultFlags) +{ + return true; +} + +void WrappedVulkan::vkCmdCopyQueryPoolResultsToMemoryKHR( + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, + const VkStridedDeviceAddressRangeKHR *pDstRange, VkAddressCommandFlagsKHR dstFlags, + VkQueryResultFlags queryResultFlags) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdWriteMarkerToMemoryAMD(SerialiserType &ser, + VkCommandBuffer commandBuffer, + const VkMemoryMarkerInfoAMD *pInfo) +{ + return true; +} + +void WrappedVulkan::vkCmdWriteMarkerToMemoryAMD(VkCommandBuffer commandBuffer, + const VkMemoryMarkerInfoAMD *pInfo) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdBeginConditionalRendering2EXT( + SerialiserType &ser, VkCommandBuffer commandBuffer, + const VkConditionalRenderingBeginInfo2EXT *pConditionalRenderingBegin) +{ + return true; +} + +void WrappedVulkan::vkCmdBeginConditionalRendering2EXT( + VkCommandBuffer commandBuffer, + const VkConditionalRenderingBeginInfo2EXT *pConditionalRenderingBegin) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdBeginTransformFeedback2EXT( + SerialiserType &ser, VkCommandBuffer commandBuffer, uint32_t firstCounterRange, + uint32_t counterRangeCount, const VkBindTransformFeedbackBuffer2InfoEXT *pCounterInfos) +{ + return true; +} + +void WrappedVulkan::vkCmdBeginTransformFeedback2EXT( + VkCommandBuffer commandBuffer, uint32_t firstCounterRange, uint32_t counterRangeCount, + const VkBindTransformFeedbackBuffer2InfoEXT *pCounterInfos) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdBindTransformFeedbackBuffers2EXT( + SerialiserType &ser, VkCommandBuffer commandBuffer, uint32_t firstBinding, + uint32_t bindingCount, const VkBindTransformFeedbackBuffer2InfoEXT *pBindingInfos) +{ + return true; +} + +void WrappedVulkan::vkCmdBindTransformFeedbackBuffers2EXT( + VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, + const VkBindTransformFeedbackBuffer2InfoEXT *pBindingInfos) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdEndTransformFeedback2EXT( + SerialiserType &ser, VkCommandBuffer commandBuffer, uint32_t firstCounterRange, + uint32_t counterRangeCount, const VkBindTransformFeedbackBuffer2InfoEXT *pCounterInfos) +{ + return true; +} + +void WrappedVulkan::vkCmdEndTransformFeedback2EXT( + VkCommandBuffer commandBuffer, uint32_t firstCounterRange, uint32_t counterRangeCount, + const VkBindTransformFeedbackBuffer2InfoEXT *pCounterInfos) +{ +} + INSTANTIATE_FUNCTION_SERIALISED(VkResult, vkCreateCommandPool, VkDevice device, const VkCommandPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *, VkCommandPool *pCommandPool); @@ -10701,3 +10813,30 @@ INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdBeginCustomResolveEXT, VkCommandBuffe INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetCheckpointNV, VkCommandBuffer commandBuffer, const void *pCheckpointMarker); + +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdBindIndexBuffer3KHR, VkCommandBuffer commandBuffer, + const VkBindIndexBuffer3InfoKHR *pInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdBindVertexBuffers3KHR, VkCommandBuffer commandBuffer, + uint32_t firstBinding, uint32_t bindingCount, + const VkBindVertexBuffer3InfoKHR *pBindingInfos); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdCopyQueryPoolResultsToMemoryKHR, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, + uint32_t firstQuery, uint32_t queryCount, + const VkStridedDeviceAddressRangeKHR *pDstRange, + VkAddressCommandFlagsKHR dstFlags, + VkQueryResultFlags queryResultFlags); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdWriteMarkerToMemoryAMD, VkCommandBuffer commandBuffer, + const VkMemoryMarkerInfoAMD *pInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdBeginConditionalRendering2EXT, + VkCommandBuffer commandBuffer, + const VkConditionalRenderingBeginInfo2EXT *pConditionalRenderingBegin); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdBeginTransformFeedback2EXT, VkCommandBuffer commandBuffer, + uint32_t firstCounterRange, uint32_t counterRangeCount, + const VkBindTransformFeedbackBuffer2InfoEXT *pCounterInfos); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdBindTransformFeedbackBuffers2EXT, + VkCommandBuffer commandBuffer, uint32_t firstBinding, + uint32_t bindingCount, + const VkBindTransformFeedbackBuffer2InfoEXT *pBindingInfos); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdEndTransformFeedback2EXT, VkCommandBuffer commandBuffer, + uint32_t firstCounterRange, uint32_t counterRangeCount, + const VkBindTransformFeedbackBuffer2InfoEXT *pCounterInfos); diff --git a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp index d9c6ce9fa..44aef3eb2 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp @@ -5304,6 +5304,179 @@ void WrappedVulkan::vkCmdTraceRaysIndirect2KHR(VkCommandBuffer commandBuffer, } } +template +bool WrappedVulkan::Serialise_vkCmdCopyImageToMemoryKHR( + SerialiserType &ser, VkCommandBuffer commandBuffer, + const VkCopyDeviceMemoryImageInfoKHR *pCopyMemoryInfo) +{ + return true; +} + +void WrappedVulkan::vkCmdCopyImageToMemoryKHR(VkCommandBuffer commandBuffer, + const VkCopyDeviceMemoryImageInfoKHR *pCopyMemoryInfo) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdCopyMemoryKHR(SerialiserType &ser, VkCommandBuffer commandBuffer, + const VkCopyDeviceMemoryInfoKHR *pCopyMemoryInfo) +{ + return true; +} + +void WrappedVulkan::vkCmdCopyMemoryKHR(VkCommandBuffer commandBuffer, + const VkCopyDeviceMemoryInfoKHR *pCopyMemoryInfo) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdFillMemoryKHR(SerialiserType &ser, VkCommandBuffer commandBuffer, + const VkDeviceAddressRangeKHR *pDstRange, + VkAddressCommandFlagsKHR dstFlags, uint32_t data) +{ + return true; +} + +void WrappedVulkan::vkCmdFillMemoryKHR(VkCommandBuffer commandBuffer, + const VkDeviceAddressRangeKHR *pDstRange, + VkAddressCommandFlagsKHR dstFlags, uint32_t data) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdUpdateMemoryKHR(SerialiserType &ser, VkCommandBuffer commandBuffer, + const VkDeviceAddressRangeKHR *pDstRange, + VkAddressCommandFlagsKHR dstFlags, + VkDeviceSize dataSize, const void *pData) +{ + return true; +} + +void WrappedVulkan::vkCmdUpdateMemoryKHR(VkCommandBuffer commandBuffer, + const VkDeviceAddressRangeKHR *pDstRange, + VkAddressCommandFlagsKHR dstFlags, VkDeviceSize dataSize, + const void *pData) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdCopyMemoryToImageKHR( + SerialiserType &ser, VkCommandBuffer commandBuffer, + const VkCopyDeviceMemoryImageInfoKHR *pCopyMemoryInfo) +{ + return true; +} + +void WrappedVulkan::vkCmdCopyMemoryToImageKHR(VkCommandBuffer commandBuffer, + const VkCopyDeviceMemoryImageInfoKHR *pCopyMemoryInfo) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdDispatchIndirect2KHR(SerialiserType &ser, + VkCommandBuffer commandBuffer, + const VkDispatchIndirect2InfoKHR *pInfo) +{ + return true; +} + +void WrappedVulkan::vkCmdDispatchIndirect2KHR(VkCommandBuffer commandBuffer, + const VkDispatchIndirect2InfoKHR *pInfo) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdDrawIndexedIndirect2KHR(SerialiserType &ser, + VkCommandBuffer commandBuffer, + const VkDrawIndirect2InfoKHR *pInfo) +{ + return true; +} + +void WrappedVulkan::vkCmdDrawIndexedIndirect2KHR(VkCommandBuffer commandBuffer, + const VkDrawIndirect2InfoKHR *pInfo) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdDrawIndirect2KHR(SerialiserType &ser, + VkCommandBuffer commandBuffer, + const VkDrawIndirect2InfoKHR *pInfo) +{ + return true; +} + +void WrappedVulkan::vkCmdDrawIndirect2KHR(VkCommandBuffer commandBuffer, + const VkDrawIndirect2InfoKHR *pInfo) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdDrawMeshTasksIndirectCount2EXT( + SerialiserType &ser, VkCommandBuffer commandBuffer, const VkDrawIndirectCount2InfoKHR *pInfo) +{ + return true; +} + +void WrappedVulkan::vkCmdDrawMeshTasksIndirectCount2EXT(VkCommandBuffer commandBuffer, + const VkDrawIndirectCount2InfoKHR *pInfo) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdDrawMeshTasksIndirect2EXT(SerialiserType &ser, + VkCommandBuffer commandBuffer, + const VkDrawIndirect2InfoKHR *pInfo) +{ + return true; +} + +void WrappedVulkan::vkCmdDrawMeshTasksIndirect2EXT(VkCommandBuffer commandBuffer, + const VkDrawIndirect2InfoKHR *pInfo) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdDrawIndirectByteCount2EXT( + SerialiserType &ser, VkCommandBuffer commandBuffer, uint32_t instanceCount, + uint32_t firstInstance, const VkBindTransformFeedbackBuffer2InfoEXT *pCounterInfo, + uint32_t counterOffset, uint32_t vertexStride) +{ + return true; +} + +void WrappedVulkan::vkCmdDrawIndirectByteCount2EXT( + VkCommandBuffer commandBuffer, uint32_t instanceCount, uint32_t firstInstance, + const VkBindTransformFeedbackBuffer2InfoEXT *pCounterInfo, uint32_t counterOffset, + uint32_t vertexStride) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdDrawIndexedIndirectCount2KHR( + SerialiserType &ser, VkCommandBuffer commandBuffer, const VkDrawIndirectCount2InfoKHR *pInfo) +{ + return true; +} + +void WrappedVulkan::vkCmdDrawIndexedIndirectCount2KHR(VkCommandBuffer commandBuffer, + const VkDrawIndirectCount2InfoKHR *pInfo) +{ +} + +template +bool WrappedVulkan::Serialise_vkCmdDrawIndirectCount2KHR(SerialiserType &ser, + VkCommandBuffer commandBuffer, + const VkDrawIndirectCount2InfoKHR *pInfo) +{ + return true; +} + +void WrappedVulkan::vkCmdDrawIndirectCount2KHR(VkCommandBuffer commandBuffer, + const VkDrawIndirectCount2InfoKHR *pInfo) +{ +} + INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdDraw, VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance); @@ -5427,3 +5600,37 @@ INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdTraceRaysIndirectKHR, VkCommandBuffer VkDeviceAddress indirectDeviceAddress); INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdTraceRaysIndirect2KHR, VkCommandBuffer commandBuffer, VkDeviceAddress indirectDeviceAddress); + +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdCopyImageToMemoryKHR, VkCommandBuffer commandBuffer, + const VkCopyDeviceMemoryImageInfoKHR *pCopyMemoryInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdCopyMemoryKHR, VkCommandBuffer commandBuffer, + const VkCopyDeviceMemoryInfoKHR *pCopyMemoryInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdCopyMemoryToImageKHR, VkCommandBuffer commandBuffer, + const VkCopyDeviceMemoryImageInfoKHR *pCopyMemoryInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdFillMemoryKHR, VkCommandBuffer commandBuffer, + const VkDeviceAddressRangeKHR *pDstRange, + VkAddressCommandFlagsKHR dstFlags, uint32_t data); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdUpdateMemoryKHR, VkCommandBuffer commandBuffer, + const VkDeviceAddressRangeKHR *pDstRange, + VkAddressCommandFlagsKHR dstFlags, VkDeviceSize dataSize, + const void *pData); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdDispatchIndirect2KHR, VkCommandBuffer commandBuffer, + const VkDispatchIndirect2InfoKHR *pInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdDrawIndexedIndirect2KHR, VkCommandBuffer commandBuffer, + const VkDrawIndirect2InfoKHR *pInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdDrawIndirect2KHR, VkCommandBuffer commandBuffer, + const VkDrawIndirect2InfoKHR *pInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdDrawMeshTasksIndirectCount2EXT, + VkCommandBuffer commandBuffer, + const VkDrawIndirectCount2InfoKHR *pInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdDrawMeshTasksIndirect2EXT, VkCommandBuffer commandBuffer, + const VkDrawIndirect2InfoKHR *pInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdDrawIndirectByteCount2EXT, VkCommandBuffer commandBuffer, + uint32_t instanceCount, uint32_t firstInstance, + const VkBindTransformFeedbackBuffer2InfoEXT *pCounterInfo, + uint32_t counterOffset, uint32_t vertexStride); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdDrawIndexedIndirectCount2KHR, + VkCommandBuffer commandBuffer, + const VkDrawIndirectCount2InfoKHR *pInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdDrawIndirectCount2KHR, VkCommandBuffer commandBuffer, + const VkDrawIndirectCount2InfoKHR *pInfo); diff --git a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp index 0fa857def..d5267ab9c 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp @@ -4163,6 +4163,21 @@ VkResult WrappedVulkan::vkCreateAccelerationStructureKHR( return ret; } +template +bool WrappedVulkan::Serialise_vkCreateAccelerationStructure2KHR( + SerialiserType &ser, VkDevice device, const VkAccelerationStructureCreateInfo2KHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, VkAccelerationStructureKHR *pAccelerationStructure) +{ + return true; +} + +VkResult WrappedVulkan::vkCreateAccelerationStructure2KHR( + VkDevice device, const VkAccelerationStructureCreateInfo2KHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, VkAccelerationStructureKHR *pAccelerationStructure) +{ + return VK_ERROR_UNKNOWN; +} + INSTANTIATE_FUNCTION_SERIALISED(VkResult, vkAllocateMemory, VkDevice device, const VkMemoryAllocateInfo *pAllocateInfo, const VkAllocationCallbacks *, VkDeviceMemory *pMemory); @@ -4210,3 +4225,8 @@ INSTANTIATE_FUNCTION_SERIALISED(VkResult, vkCreateAccelerationStructureKHR, VkDe INSTANTIATE_FUNCTION_SERIALISED(void, vkUnmapMemory2, VkDevice device, const VkMemoryUnmapInfo *pMemoryUnmapInfo); + +INSTANTIATE_FUNCTION_SERIALISED(VkResult, vkCreateAccelerationStructure2KHR, VkDevice device, + const VkAccelerationStructureCreateInfo2KHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkAccelerationStructureKHR *pAccelerationStructure);