Module: Mesa Branch: master Commit: 50376e0c0e81f80cac6ec77da491241e4ccf57f0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=50376e0c0e81f80cac6ec77da491241e4ccf57f0
Author: Timothy Arceri <[email protected]> Date: Mon Jan 18 11:13:27 2016 +1100 glsl: fix segfault linking subroutine uniform with explicit location Reviewed-by: Dave Airlie <[email protected]> Cc: "11.0 11.1" [email protected] --- 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 3f40c0b..6657777 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); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
