From ed810eb0a0c795dcfdf0d22f389a4020203bdff4 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sun, 7 Feb 2021 11:05:28 -0500 Subject: [PATCH] panfrost: Don't truncate uniform_count Will fix INSTR_INVALID_OPERAND faults when we push other UBOs. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Boris Brezillon Part-of: --- src/gallium/drivers/panfrost/pan_assemble.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_assemble.c b/src/gallium/drivers/panfrost/pan_assemble.c index 31d262cb039..38614d2c62d 100644 --- a/src/gallium/drivers/panfrost/pan_assemble.c +++ b/src/gallium/drivers/panfrost/pan_assemble.c @@ -370,9 +370,7 @@ panfrost_shader_compile(struct panfrost_context *ctx, if (outputs_written) *outputs_written = s->info.outputs_written; - /* Separate as primary uniform count is truncated. Sysvals are prefix - * uniforms */ - state->uniform_count = MIN2(s->num_uniforms + program->sysval_count, program->uniform_cutoff); + state->uniform_count = program->uniform_cutoff; state->work_reg_count = program->work_register_count; if (pan_is_bifrost(dev))