diff options
| author | Timothy Arceri <[email protected]> | 2016-01-18 11:13:27 +1100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-01-22 11:44:49 +0000 |
| commit | a15cf952dc8b974e8ce0e27255299376653378b0 (patch) | |
| tree | e93f20601255fbbdc055b01a72af0ff48b998656 /src/glsl | |
| parent | f9763f24addb22b07b961f63c4f57d95767bb3be (diff) | |
glsl: fix segfault linking subroutine uniform with explicit location
Reviewed-by: Dave Airlie <[email protected]>
Cc: "11.0 11.1" [email protected]
(cherry picked from commit 50376e0c0e81f80cac6ec77da491241e4ccf57f0)
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/linker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index bccd4d4d7fd..02295ea2f13 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -3134,7 +3134,7 @@ check_explicit_uniform_locations(struct gl_context *ctx, if (var && (var->data.mode == ir_var_uniform && 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); |