From 66076ca7e833d20994302879abdd85f8152315e1 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Tue, 28 Jan 2025 16:56:31 -0600 Subject: [PATCH] nvk: Handle pCounterBuffers == NULL in Begin/EndTransformFeedback Fixes: 5fd7df4aa2c3 ("nvk: Support for vertex shader transform feedback") Part-of: --- src/nouveau/vulkan/nvk_cmd_draw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c index 4181c8f5017..27945d97151 100644 --- a/src/nouveau/vulkan/nvk_cmd_draw.c +++ b/src/nouveau/vulkan/nvk_cmd_draw.c @@ -4578,7 +4578,7 @@ nvk_CmdBeginTransformFeedbackEXT(VkCommandBuffer commandBuffer, } for (uint32_t i = 0; i < counterBufferCount; ++i) { - if (pCounterBuffers[i] == VK_NULL_HANDLE) + if (pCounterBuffers == NULL || pCounterBuffers[i] == VK_NULL_HANDLE) continue; VK_FROM_HANDLE(nvk_buffer, buffer, pCounterBuffers[i]); @@ -4618,7 +4618,7 @@ nvk_CmdEndTransformFeedbackEXT(VkCommandBuffer commandBuffer, P_IMMD(p, NV9097, SET_STREAM_OUTPUT, ENABLE_FALSE); for (uint32_t i = 0; i < counterBufferCount; ++i) { - if (pCounterBuffers[i] == VK_NULL_HANDLE) + if (pCounterBuffers == NULL || pCounterBuffers[i] == VK_NULL_HANDLE) continue; VK_FROM_HANDLE(nvk_buffer, buffer, pCounterBuffers[i]);