diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-03-31 10:24:36 +1000 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-03-31 05:23:57 +0000 |
| commit | a17e10b1096f4b03ba71485a3586d2fdbb3cd8a4 (patch) | |
| tree | 32870de56798f4aa149ebfa4d9f27f04af7794c0 | |
| parent | cd222e4a9cf0727e9b38e7f26d00ff2e2e8acb02 (diff) | |
lavapipe: only reference pCounterBuffers if non-NULL
Fixes crash in validation layer tests.
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9937>
| -rw-r--r-- | src/gallium/frontends/lavapipe/lvp_cmd_buffer.c | 10 |
1 files 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 |