Mesa (master): glsl: Fix -Wshadow warning

[GitLab Mirror]

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

Author: Tony Wasserka <tony.wasserka at gmx.de>
Date:   Fri Nov  6 13:31:39 2020 +0100

glsl: Fix -Wshadow warning

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7552>

---

 src/compiler/glsl_types.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/compiler/glsl_types.h b/src/compiler/glsl_types.h
index 744b01dca9a..5e78e1e1ac7 100644
--- a/src/compiler/glsl_types.h
+++ b/src/compiler/glsl_types.h
@@ -1057,11 +1057,11 @@ public:
          return 0;
 
       unsigned size = length;
-      const glsl_type *base_type = fields.array;
+      const glsl_type *array_base_type = fields.array;
 
-      while (base_type->is_array()) {
-         size = size * base_type->length;
-         base_type = base_type->fields.array;
+      while (array_base_type->is_array()) {
+         size = size * array_base_type->length;
+         array_base_type = array_base_type->fields.array;
       }
       return size;
    }