summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2016-01-18 11:13:27 +1100
committerTimothy Arceri <[email protected]>2016-01-18 11:30:45 +1100
commit50376e0c0e81f80cac6ec77da491241e4ccf57f0 (patch)
treeb561e89c36ecdadcf0bad2c02c68915738ba9e4b
parent4ac1274caa260300e951d3e66596d308ec531cfa (diff)
glsl: fix segfault linking subroutine uniform with explicit location
Reviewed-by: Dave Airlie <[email protected]> Cc: "11.0 11.1" [email protected]
-rw-r--r--src/glsl/linker.cpp2
1 files changed, 1 insertions, 1 deletions
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);