freedreno/computerator: Fix mergedregs

This was getting set *after* ir3_shader_assemble, which was too late.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13426>
This commit is contained in:
Rob Clark 2021-10-19 08:44:08 -07:00 committed by Marge Bot
parent 22a203aa4c
commit 5948ff4826
2 changed files with 3 additions and 2 deletions

View file

@ -35,8 +35,6 @@ ir3_asm_assemble(struct ir3_compiler *c, FILE *in)
errx(-1, "assembler failed");
struct ir3_shader_variant *v = shader->variants;
v->mergedregs = true;
kernel->v = v;
kernel->bin = v->bin;

View file

@ -42,6 +42,9 @@ ir3_parse_asm(struct ir3_compiler *c, struct ir3_kernel_info *info, FILE *in)
v->shader = shader;
v->const_state = rzalloc_size(v, sizeof(*v->const_state));
if (c->gen >= 6)
v->mergedregs = true;
shader->variants = v;
shader->variant_count = 1;