[Mesa-stable] [PATCH] glsl: fix segfault linking subroutine uniform with explicit location

[Timothy Arceri]

Cc: Dave Airlie <airlied at gmail.com>
Cc: "11.0 11.1" mesa-stable at lists.freedesktop.org
---
 src/glsl/linker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index dbf6ce9..1d673b6 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -3212,7 +3212,7 @@ check_explicit_uniform_locations(struct gl_context *ctx,
 
          if (var->data.explicit_location) {
             bool ret;
-            if (var->type->is_subroutine())
+            if (var->type->without_array()->is_subroutine())
                ret = reserve_subroutine_explicit_locations(prog, sh, var);
             else
                ret = reserve_explicit_locations(prog, uniform_map, var);
-- 
2.4.3