Bläddra i källkod

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: 725b1a406d ("mesa/util: add allow_glsl_relaxed_es driconfig override")
tags/18.2-branchpoint
Timothy Arceri 7 år sedan
förälder
incheckning
6c243ac2dd
1 ändrade filer med 2 tillägg och 1 borttagningar
  1. 2
    1
      src/compiler/glsl/linker.cpp

+ 2
- 1
src/compiler/glsl/linker.cpp Visa fil

@@ -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;

Laddar…
Avbryt
Spara