From: Eric Anholt Date: Fri, 17 Apr 2020 17:45:17 +0000 (-0700) Subject: freedreno: Fix calculation of the const buffer cmdstream size. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=69c8dfd49f565283f599b3be9af3f1327ea78803;p=mesa.git freedreno: Fix calculation of the const buffer cmdstream size. The HW packet requires padding the number of pointers you emit, and we would assertion fail about running out of buffer space if the number of UBOs to be uploaded was odd. Fixes: b4df115d3f3c ("freedreno/a6xx: pre-calculate userconst stateobj size") Part-of: --- diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_program.c b/src/gallium/drivers/freedreno/a6xx/fd6_program.c index 6e19deee03e..fa98aae546f 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_program.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_program.c @@ -1030,7 +1030,7 @@ fd6_shader_state_create(struct pipe_context *pctx, const struct pipe_shader_stat /* also account for UBO addresses: */ packets += 1; - size += 2 * shader->const_state.num_ubos; + size += 2 * align(shader->const_state.num_ubos, 2); unsigned sizedwords = (4 * packets) + size; shader->ubo_state.cmdstream_size = sizedwords * 4;