From 1a96d9ef1c2821df7e49f6bf685d26c264167933 Mon Sep 17 00:00:00 2001
From: Timothy Arceri <t_arceri@yahoo.com.au>
Date: Tue, 24 Feb 2015 17:28:51 +1100
Subject: glsl: let interface linking code validate its arrays

Currently intrastage arrays are validated twice for interface blocks.

Reviewed-by: Mark Janes <mark.a.janes@intel.com>
---
 src/glsl/linker.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 590f364d6c2..0c446777970 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -762,7 +762,8 @@ cross_validate_globals(struct gl_shader_program *prog,
             /* Check if types match. Interface blocks have some special
              * rules so we handle those elsewhere.
              */
-	    if (var->type != existing->type) {
+           if (var->type != existing->type &&
+                !var->is_interface_instance()) {
 	       if (!validate_intrastage_arrays(prog, var, existing)) {
                   if (var->type->is_record() && existing->type->is_record()
                       && existing->type->record_compare(var->type)) {
-- 
cgit v1.2.3