From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 16 Feb 2011 02:17:53 +0000 (-0800)
Subject: linker: Fix off-by-one error implicit array sizing
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=25b36e8ff81a9c951085d6dd802a7534db476f5a;p=mesa.git

linker: Fix off-by-one error implicit array sizing

Arrays are zero based.  If the highest element accessed is 6, the
array needs to have 7 elements.

Fixes piglit test glsl-fs-implicit-array-size-03 and bugzilla #34198.

NOTE: This is a candidate for the 7.9 and 7.10 branches.
---

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 46cd1950c86..6c003bb0256 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -926,7 +926,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;