Module: Mesa Branch: master Commit: 6c243ac2dd3e88f680726dab6dca280f2b07199d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c243ac2dd3e88f680726dab6dca280f2b07199d
Author: Timothy Arceri <[email protected]> Date: Tue Jun 19 17:52:00 2018 +1000 glsl: fix desktop glsl linking regression The prog->Shaders[i]->IsES check was accidentally removed causing ES linking rules to be applied to desktop GLSL. Fixes: 725b1a406dbe ("mesa/util: add allow_glsl_relaxed_es driconfig override") --- src/compiler/glsl/linker.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 487a1ffcb0..f6fce2d4e8 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -4829,7 +4829,8 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) /* In desktop GLSL, different shader versions may be linked together. In * GLSL ES, all shader versions must be the same. */ - if (!ctx->Const.AllowGLSLRelaxedES && min_version != max_version) { + if (!ctx->Const.AllowGLSLRelaxedES && prog->Shaders[0]->IsES && + min_version != max_version) { linker_error(prog, "all shaders must use same shading " "language version\n"); goto done; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
