Mesa (master): st/mesa: silence unused/uninitialized var warnings

Brian Paul brianp at kemper.freedesktop.org
Fri Apr 7 19:51:10 UTC 2017


Module: Mesa
Branch: master
Commit: ee3f75f538beb8df448001a8038ba2ba732b5d8e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee3f75f538beb8df448001a8038ba2ba732b5d8e

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Apr  5 14:07:45 2017 -0600

st/mesa: silence unused/uninitialized var warnings

Signed-off-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/state_tracker/st_glsl_to_nir.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index 674ccd07a4..72fd70b215 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -181,10 +181,11 @@ st_nir_assign_uniform_locations(struct gl_program *prog,
          continue;
 
       if (uniform->type->is_sampler()) {
-         unsigned val;
+         unsigned val = 0;
          bool found = shader_program->UniformHash->get(val, uniform->name);
          loc = shaderidx++;
          assert(found);
+         (void) found; /* silence unused var warning */
          /* this ensure that nir_lower_samplers looks at the correct
           * shader_program->UniformStorage[location]:
           */




More information about the mesa-commit mailing list