From fe613a8de95a95a3c44bd47c80316830ab10945e Mon Sep 17 00:00:00 2001 From: Icecream95 Date: Sun, 10 Jul 2022 20:48:16 +1200 Subject: [PATCH] panfrost: Only emit images when they are present nr_images is the trigger for allocating double the number of buffers for attributes. When there are no images, there is not always enough space for ALIGN_POT(k, 2) to not move k out of bounds, so don't execute the line in that case. Fixes: dc85f65e059 ("panfrost: emit shader image attribute descriptors") Part-of: --- src/gallium/drivers/panfrost/pan_cmdstream.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index 7e4ec15..4dd8fcb 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -2165,10 +2165,12 @@ panfrost_emit_vertex_data(struct panfrost_batch *batch, } #endif - k = ALIGN_POT(k, 2); - emit_image_attribs(ctx, PIPE_SHADER_VERTEX, out + so->num_elements, k); - emit_image_bufs(batch, PIPE_SHADER_VERTEX, bufs + k, k); - k += (util_last_bit(ctx->image_mask[PIPE_SHADER_VERTEX]) * 2); + if (nr_images) { + k = ALIGN_POT(k, 2); + emit_image_attribs(ctx, PIPE_SHADER_VERTEX, out + so->num_elements, k); + emit_image_bufs(batch, PIPE_SHADER_VERTEX, bufs + k, k); + k += (util_last_bit(ctx->image_mask[PIPE_SHADER_VERTEX]) * 2); + } #if PAN_ARCH >= 6 /* We need an empty attrib buf to stop the prefetching on Bifrost */ -- 2.7.4