From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Tue, 17 May 2016 01:34:38 +0000 (+1000)
Subject: glsl: don't incorrectly eliminate patches with explicit locations
X-Git-Tag: upstream/17.1.0~9838
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00441829e7317b2327c425cb8c364363b176defa;p=platform%2Fupstream%2Fmesa.git

glsl: don't incorrectly eliminate patches with explicit locations

These varying have a separate location domain from per-vertex varyings
and need to be handled separately.

Reviewed-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index bf30b82..70c6317 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -2888,7 +2888,8 @@ match_explicit_outputs_to_inputs(struct gl_shader_program *prog,
                                  gl_shader *consumer)
 {
    glsl_symbol_table parameters;
-   ir_variable *explicit_locations[MAX_VARYING][4] = { {NULL, NULL} };
+   ir_variable *explicit_locations[MAX_VARYINGS_INCL_PATCH][4] =
+      { {NULL, NULL} };
 
    /* Find all shader outputs in the "producer" stage.
     */