From a17e10b1096f4b03ba71485a3586d2fdbb3cd8a4 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 31 Mar 2021 10:24:36 +1000 Subject: [PATCH] lavapipe: only reference pCounterBuffers if non-NULL Fixes crash in validation layer tests. Reviewed-By: Mike Blumenkrantz Part-of: --- src/gallium/frontends/lavapipe/lvp_cmd_buffer.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_cmd_buffer.c b/src/gallium/frontends/lavapipe/lvp_cmd_buffer.c index a3f376cfa92..bf8db50c00c 100644 --- a/src/gallium/frontends/lavapipe/lvp_cmd_buffer.c +++ b/src/gallium/frontends/lavapipe/lvp_cmd_buffer.c @@ -1718,7 +1718,10 @@ VKAPI_ATTR void VKAPI_CALL lvp_CmdBeginTransformFeedbackEXT( cmd->u.begin_transform_feedback.counter_buffer_offsets = (VkDeviceSize *)(cmd->u.begin_transform_feedback.counter_buffers + counterBufferCount); for (unsigned i = 0; i < counterBufferCount; i++) { - cmd->u.begin_transform_feedback.counter_buffers[i] = lvp_buffer_from_handle(pCounterBuffers[i]); + if (pCounterBuffers) + cmd->u.begin_transform_feedback.counter_buffers[i] = lvp_buffer_from_handle(pCounterBuffers[i]); + else + cmd->u.begin_transform_feedback.counter_buffers[i] = NULL; if (pCounterBufferOffsets) cmd->u.begin_transform_feedback.counter_buffer_offsets[i] = pCounterBufferOffsets[i]; else @@ -1750,7 +1753,10 @@ VKAPI_ATTR void VKAPI_CALL lvp_CmdEndTransformFeedbackEXT( cmd->u.begin_transform_feedback.counter_buffer_offsets = (VkDeviceSize *)(cmd->u.begin_transform_feedback.counter_buffers + counterBufferCount); for (unsigned i = 0; i < counterBufferCount; i++) { - cmd->u.begin_transform_feedback.counter_buffers[i] = lvp_buffer_from_handle(pCounterBuffers[i]); + if (pCounterBuffers) + cmd->u.begin_transform_feedback.counter_buffers[i] = lvp_buffer_from_handle(pCounterBuffers[i]); + else + cmd->u.begin_transform_feedback.counter_buffers[i] = NULL; if (pCounterBufferOffsets) cmd->u.begin_transform_feedback.counter_buffer_offsets[i] = pCounterBufferOffsets[i]; else