Mesa (main): ir3: Allocate disasm_info under variant

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri May 13 17:52:17 UTC 2022


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

Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Wed Feb 16 17:20:22 2022 +0100

ir3: Allocate disasm_info under variant

This shouldn't matter much because it gets stolen later, but the shader
is going away.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16147>

---

 src/freedreno/ir3/ir3_shader.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/freedreno/ir3/ir3_shader.c b/src/freedreno/ir3/ir3_shader.c
index 927635b4690..9fb6749a594 100644
--- a/src/freedreno/ir3/ir3_shader.c
+++ b/src/freedreno/ir3/ir3_shader.c
@@ -252,12 +252,12 @@ assemble_variant(struct ir3_shader_variant *v)
          fprintf(stream,
                  "Native code%s for unnamed %s shader %s with sha1 %s:\n",
                  shader_overridden ? " (overridden)" : "", ir3_shader_stage(v),
-                 v->shader->nir->info.name, sha1buf);
+                 v->name, sha1buf);
          ir3_shader_disasm(v, v->bin, stream);
 
          fclose(stream);
 
-         v->disasm_info.disasm = ralloc_size(v->shader, stream_size + 1);
+         v->disasm_info.disasm = ralloc_size(v, stream_size + 1);
          memcpy(v->disasm_info.disasm, stream_data, stream_size);
          v->disasm_info.disasm[stream_size] = 0;
          free(stream_data);



More information about the mesa-commit mailing list