From: Andreas Baierl Date: Fri, 27 Sep 2019 06:32:12 +0000 (+0200) Subject: lima: Fix crash when there are no vertex shader attributes X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0ee931c1de82507131ea2f327d47342cbfc0c64d;p=mesa.git lima: Fix crash when there are no vertex shader attributes Signed-off-by: Andreas Baierl Reviewed-by: Vasily Khoruzhick --- diff --git a/src/gallium/drivers/lima/lima_draw.c b/src/gallium/drivers/lima/lima_draw.c index bd6b62a3bb6..3d22ae92781 100644 --- a/src/gallium/drivers/lima/lima_draw.c +++ b/src/gallium/drivers/lima/lima_draw.c @@ -741,13 +741,13 @@ lima_pack_vs_cmd(struct lima_context *ctx, const struct pipe_draw_info *info) int num_varryings = ctx->vs->num_varying; int num_attributes = ctx->vertex_elements->num_elements; - VS_CMD_VARYING_ATTRIBUTE_COUNT(num_varryings, num_attributes); + VS_CMD_VARYING_ATTRIBUTE_COUNT(num_varryings, MAX2(1, num_attributes)); VS_CMD_UNKNOWN1(); VS_CMD_ATTRIBUTES_ADDRESS( lima_ctx_buff_va(ctx, lima_ctx_buff_gp_attribute_info, LIMA_CTX_BUFF_SUBMIT_GP), - num_attributes); + MAX2(1, num_attributes)); VS_CMD_VARYINGS_ADDRESS( lima_ctx_buff_va(ctx, lima_ctx_buff_gp_varying_info, LIMA_CTX_BUFF_SUBMIT_GP), @@ -1140,7 +1140,7 @@ lima_update_gp_attribute_info(struct lima_context *ctx, const struct pipe_draw_i uint32_t *attribute = lima_ctx_buff_alloc(ctx, lima_ctx_buff_gp_attribute_info, - ve->num_elements * 8, true); + MAX2(1, ve->num_elements) * 8, true); int n = 0; for (int i = 0; i < ve->num_elements; i++) {