From 50376e0c0e81f80cac6ec77da491241e4ccf57f0 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 18 Jan 2016 11:13:27 +1100 Subject: [PATCH] glsl: fix segfault linking subroutine uniform with explicit location Reviewed-by: Dave Airlie Cc: "11.0 11.1" mesa-stable@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 3f40c0be332..6657777d74c 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -3162,7 +3162,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.30.2