From 824cc0e933bf04e3b7aeb81900956ca7e0de6959 Mon Sep 17 00:00:00 2001
From: Connor Abbott <cwabbott0@gmail.com>
Date: Wed, 11 Oct 2023 13:04:18 +0200
Subject: [PATCH] ir3: Remove ir3_info::data

This isn't useful, and it was getting serialized resulting in garbage in
the blob and tests that check for consistent serialization failing.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33780>
---
 src/freedreno/ir3/ir3.c | 10 ++++------
 src/freedreno/ir3/ir3.h |  1 -
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/freedreno/ir3/ir3.c b/src/freedreno/ir3/ir3.c
index 7549f8352ce..9a6cac8080f 100644
--- a/src/freedreno/ir3/ir3.c
+++ b/src/freedreno/ir3/ir3.c
@@ -67,11 +67,10 @@ is_shared_consts(struct ir3_compiler *compiler,
 }
 
 static void
-collect_reg_info(struct ir3_instruction *instr, struct ir3_register *reg,
+collect_reg_info(struct ir3_shader_variant *v,
+                 struct ir3_instruction *instr, struct ir3_register *reg,
                  struct ir3_info *info)
 {
-   struct ir3_shader_variant *v = info->data;
-
    if (reg->flags & IR3_REG_IMMED) {
       /* nothing to do */
       return;
@@ -248,7 +247,6 @@ ir3_collect_info(struct ir3_shader_variant *v)
    const struct ir3_compiler *compiler = v->compiler;
 
    memset(info, 0, sizeof(*info));
-   info->data = v;
    info->max_reg = -1;
    info->max_half_reg = -1;
    info->max_const = -1;
@@ -290,7 +288,7 @@ ir3_collect_info(struct ir3_shader_variant *v)
 
          foreach_src (reg, instr) {
             if (!is_reg_gpr(reg) || !regmask_get(&aliases, reg)) {
-               collect_reg_info(instr, reg, info);
+               collect_reg_info(v, instr, reg, info);
             }
          }
 
@@ -299,7 +297,7 @@ ir3_collect_info(struct ir3_shader_variant *v)
                 instr->cat7.alias_scope == ALIAS_TEX) {
                regmask_set(&aliases, instr->dsts[0]);
             } else if (is_dest_gpr(reg)) {
-               collect_reg_info(instr, reg, info);
+               collect_reg_info(v, instr, reg, info);
             }
          }
 
diff --git a/src/freedreno/ir3/ir3.h b/src/freedreno/ir3/ir3.h
index 2d6e62e4502..9f8ddce2781 100644
--- a/src/freedreno/ir3/ir3.h
+++ b/src/freedreno/ir3/ir3.h
@@ -28,7 +28,6 @@ struct ir3_instruction;
 struct ir3_block;
 
 struct ir3_info {
-   void *data; /* used internally in ir3 assembler */
    /* Size in bytes of the shader binary, including NIR constants and
     * padding
     */