Mesa (master): nir: fix unused variable warning in find_and_update_previous_uniform_storage

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Nov 7 00:36:50 UTC 2019


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

Author: Kai Wasserbäch <kai at dev.carbon-project.org>
Date:   Sat Sep 28 18:55:32 2019 +0200

nir: fix unused variable warning in find_and_update_previous_uniform_storage

This commit fixes the following warning:
../src/compiler/glsl/gl_nir_link_uniforms.c: In function ‘find_and_update_previous_uniform_storage’:
../src/compiler/glsl/gl_nir_link_uniforms.c:166:16: warning: unused variable ‘num_blks’ [-Wunused-variable]
  166 |       unsigned num_blks = nir_variable_is_in_ubo(var) ?
      |                ^~~~~~~~

Signed-off-by: Kai Wasserbäch <kai at dev.carbon-project.org>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/compiler/glsl/gl_nir_link_uniforms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/glsl/gl_nir_link_uniforms.c b/src/compiler/glsl/gl_nir_link_uniforms.c
index 7aebe0dd7e2..ffddeb20b44 100644
--- a/src/compiler/glsl/gl_nir_link_uniforms.c
+++ b/src/compiler/glsl/gl_nir_link_uniforms.c
@@ -163,7 +163,7 @@ find_and_update_previous_uniform_storage(struct gl_shader_program *prog,
    if (nir_variable_is_in_block(var)) {
       struct gl_uniform_storage *uniform = NULL;
 
-      unsigned num_blks = nir_variable_is_in_ubo(var) ?
+      ASSERTED unsigned num_blks = nir_variable_is_in_ubo(var) ?
          prog->data->NumUniformBlocks :
          prog->data->NumShaderStorageBlocks;
 




More information about the mesa-commit mailing list