From 9521122e1898d75c7d87db89330b31a4b095991d Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 11 Nov 2025 11:23:44 +0000 Subject: [PATCH] Don't crash on binding a NULL index buffer --- renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp index 8675203d0..3f4d73da6 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp @@ -4481,7 +4481,8 @@ void WrappedVulkan::vkCmdBindIndexBuffer(VkCommandBuffer commandBuffer, VkBuffer Serialise_vkCmdBindIndexBuffer(ser, commandBuffer, buffer, offset, indexType); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); - record->MarkBufferFrameReferenced(GetRecord(buffer), 0, VK_WHOLE_SIZE, eFrameRef_Read); + if(buffer != VK_NULL_HANDLE) + record->MarkBufferFrameReferenced(GetRecord(buffer), 0, VK_WHOLE_SIZE, eFrameRef_Read); } } @@ -9396,7 +9397,8 @@ void WrappedVulkan::vkCmdBindIndexBuffer2(VkCommandBuffer commandBuffer, VkBuffe Serialise_vkCmdBindIndexBuffer2(ser, commandBuffer, buffer, offset, size, indexType); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); - record->MarkBufferFrameReferenced(GetRecord(buffer), offset, size, eFrameRef_Read); + if(buffer != VK_NULL_HANDLE) + record->MarkBufferFrameReferenced(GetRecord(buffer), offset, size, eFrameRef_Read); } }