Mesa (master): glsl: Fix GCC unused-variable warning in release build.

Vinson Lee vlee at kemper.freedesktop.org
Thu Mar 5 01:20:52 UTC 2015


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

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Tue Mar  3 18:46:13 2015 -0800

glsl: Fix GCC unused-variable warning in release build.

  CXX      ast_array_index.lo
ast_array_index.cpp: In function ‘void update_max_array_access(ir_rvalue*, int, YYLTYPE*, _mesa_glsl_parse_state*)’:
ast_array_index.cpp:86:30: warning: unused variable ‘interface_type’ [-Wunused-variable]
             const glsl_type *interface_type =
                              ^

Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Timothy Arceri <t_arceri at yahoo.com.au>

---

 src/glsl/ast_array_index.cpp |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/glsl/ast_array_index.cpp b/src/glsl/ast_array_index.cpp
index ff0c757..ecef651 100644
--- a/src/glsl/ast_array_index.cpp
+++ b/src/glsl/ast_array_index.cpp
@@ -83,11 +83,9 @@ update_max_array_access(ir_rvalue *ir, int idx, YYLTYPE *loc,
 
       if (deref_var != NULL) {
          if (deref_var->var->is_interface_instance()) {
-            const glsl_type *interface_type =
-               deref_var->var->get_interface_type();
             unsigned field_index =
                deref_record->record->type->field_index(deref_record->field);
-            assert(field_index < interface_type->length);
+            assert(field_index < deref_var->var->get_interface_type()->length);
 
             unsigned *const max_ifc_array_access =
                deref_var->var->get_max_ifc_array_access();




More information about the mesa-commit mailing list