Mesa (main): radeonsi: don't print uninitialized inlined_uniform_values

[GitLab Mirror]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Nov 18 17:36:14 2021 -0500

radeonsi: don't print uninitialized inlined_uniform_values

We don't set them and we don't read them if they are disabled, so don't
print them either. This silences valgrind warnings.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13878>

---

 src/gallium/drivers/radeonsi/si_shader.c | 39 ++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index df108dca8cc..705ea44b08b 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1269,22 +1269,33 @@ static void si_dump_shader_key(const struct si_shader *shader, FILE *f)
       fprintf(f, "  opt.ngg_culling = 0x%x\n", key->ge.opt.ngg_culling);
    }
 
-   if (stage <= MESA_SHADER_GEOMETRY) {
+   if (stage <= MESA_SHADER_GEOMETRY)
       fprintf(f, "  opt.prefer_mono = %u\n", key->ge.opt.prefer_mono);
-      fprintf(f, "  opt.inline_uniforms = %u (0x%x, 0x%x, 0x%x, 0x%x)\n",
-              key->ge.opt.inline_uniforms,
-              key->ge.opt.inlined_uniform_values[0],
-              key->ge.opt.inlined_uniform_values[1],
-              key->ge.opt.inlined_uniform_values[2],
-              key->ge.opt.inlined_uniform_values[3]);
-   } else {
+   else
       fprintf(f, "  opt.prefer_mono = %u\n", key->ps.opt.prefer_mono);
-      fprintf(f, "  opt.inline_uniforms = %u (0x%x, 0x%x, 0x%x, 0x%x)\n",
-              key->ps.opt.inline_uniforms,
-              key->ps.opt.inlined_uniform_values[0],
-              key->ps.opt.inlined_uniform_values[1],
-              key->ps.opt.inlined_uniform_values[2],
-              key->ps.opt.inlined_uniform_values[3]);
+
+   if (stage <= MESA_SHADER_GEOMETRY) {
+      if (key->ge.opt.inline_uniforms) {
+         fprintf(f, "  opt.inline_uniforms = %u (0x%x, 0x%x, 0x%x, 0x%x)\n",
+                 key->ge.opt.inline_uniforms,
+                 key->ge.opt.inlined_uniform_values[0],
+                 key->ge.opt.inlined_uniform_values[1],
+                 key->ge.opt.inlined_uniform_values[2],
+                 key->ge.opt.inlined_uniform_values[3]);
+      } else {
+         fprintf(f, "  opt.inline_uniforms = 0\n");
+      }
+   } else {
+      if (key->ps.opt.inline_uniforms) {
+         fprintf(f, "  opt.inline_uniforms = %u (0x%x, 0x%x, 0x%x, 0x%x)\n",
+                 key->ps.opt.inline_uniforms,
+                 key->ps.opt.inlined_uniform_values[0],
+                 key->ps.opt.inlined_uniform_values[1],
+                 key->ps.opt.inlined_uniform_values[2],
+                 key->ps.opt.inlined_uniform_values[3]);
+      } else {
+         fprintf(f, "  opt.inline_uniforms = 0\n");
+      }
    }
 }