glsl: Refactor AST-to-HIR code handling variable initializers

[mesa.git] / src / glsl / linker.cpp

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 46cd1950c86b42ccc21d23627462c14296be5e19..7db5c5e8d5313b4c5040bad5caeb53b51862c235 100644 (file)
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -63,10 +63,6 @@
  *
  * \author Ian Romanick <ian.d.romanick@intel.com>
  */
-#include <cstdlib>
-#include <cstdio>
-#include <cstdarg>
-#include <climits>
 
 #include "main/core.h"
 #include "glsl_symbol_table.h"
@@ -926,7 +922,7 @@ link_intrastage_shaders(void *mem_ctx,
            if (var->type->is_array() && (var->type->length == 0)) {
               const glsl_type *type =
                  glsl_type::get_array_instance(var->type->fields.array,
-                                               var->max_array_access);
+                                               var->max_array_access + 1);
 
               assert(type != NULL);
               var->type = type;