Mesa (main): freedreno/computerator: Fix mergedregs

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 5948ff4826864b1e1573030b16cc2b3b1a13819a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5948ff4826864b1e1573030b16cc2b3b1a13819a

Author: Rob Clark <robdclark at chromium.org>
Date:   Tue Oct 19 08:44:08 2021 -0700

freedreno/computerator: Fix mergedregs

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

Signed-off-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13426>

---

 src/freedreno/computerator/ir3_asm.c | 2 --
 src/freedreno/ir3/ir3_assembler.c    | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/freedreno/computerator/ir3_asm.c b/src/freedreno/computerator/ir3_asm.c
index b9c295adff9..1b4fdc10167 100644
--- a/src/freedreno/computerator/ir3_asm.c
+++ b/src/freedreno/computerator/ir3_asm.c
@@ -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;
 
diff --git a/src/freedreno/ir3/ir3_assembler.c b/src/freedreno/ir3/ir3_assembler.c
index dd46f882be3..f4777c32576 100644
--- a/src/freedreno/ir3/ir3_assembler.c
+++ b/src/freedreno/ir3/ir3_assembler.c
@@ -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;