Mesa (master): glsl: check if implicitly sized arrays match explicitly sized arrays across the same stage

[Timothy Arceri]

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

Author: Timothy Arceri <t_arceri at yahoo.com.au>
Date:   Tue Nov 25 23:04:23 2014 +1100

glsl: check if implicitly sized arrays match explicitly sized arrays across the same stage

V2: Improve error message.

Signed-off-by: Timothy Arceri <t_arceri at yahoo.com.au>
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>

---

 src/glsl/linker.cpp |   21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 44468c7..3f5eac1 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -731,8 +731,27 @@ cross_validate_globals(struct gl_shader_program *prog,
 		   && ((var->type->length == 0)
 		       || (existing->type->length == 0))) {
 		  if (var->type->length != 0) {
+                     if (var->type->length <= existing->data.max_array_access) {
+                        linker_error(prog, "%s `%s' declared as type "
+                                     "`%s' but outermost dimension has an index"
+                                     " of `%i'\n",
+                                     mode_string(var),
+                                     var->name, var->type->name,
+                                     existing->data.max_array_access);
+                        return;
+                     }
 		     existing->type = var->type;
-		  }
+		  } else if (existing->type->length != 0
+                             && existing->type->length <=
+                                var->data.max_array_access) {
+                     linker_error(prog, "%s `%s' declared as type "
+                                  "`%s' but outermost dimension has an index"
+                                  " of `%i'\n",
+                                  mode_string(var),
+                                  var->name, existing->type->name,
+                                  var->data.max_array_access);
+                     return;
+                  }
                } else if (var->type->is_record()
 		   && existing->type->is_record()
 		   && existing->type->record_compare(var->type)) {