fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-10 06:00:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "glsl: Refuse to link GLSL 1.40+ shaders that would use fixed function."

Browse source 
This reverts commit 4ec449a6ed.

I meant to not push this one.  Review found that a link error is not
mandated: it should link, but you get undefined rendering if you rely
on a missing stage.

     page 42/55 section 2.11 "Vertex Shaders":

     "If the program object has no vertex shader, or no program object
      is currently in use, the results of vertex shader execution are
      undefined."

(and similar for page 160/173 section 3.9 "Fragment Shaders" for FS,
and page 45/58 section 2.11.2 "Program Objects" for program being 0)

It turns out the commit was broken anyway, because it was missing a
"goto done", so linkstatus got smashed back to true later and the
error just showed up as a warning in the infolog.
This commit is contained in:
Eric Anholt 2012-04-16 13:37:04 -07:00
parent f084b5ad32
commit 35f2fb70d3
1 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/glsl/linker.cpp
View file

@ -2225,20 +2225,6 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
goto done;
}
if (max_version >= 140) {
/* Note that this will change with GL_ARB_separate_shader_objects */
if (num_vert_shaders == 0) {
linker_error(prog,
"GLSL %.02f without GL_ARB_compatibility requires a "
"vertex shader", max_version / 100.0);
}
if (num_frag_shaders == 0) {
linker_error(prog,
"GLSL %.02f without GL_ARB_compatibility requires a "
"fragment shader", max_version / 100.0);
}
}
prog->Version = max_version;
for (unsigned int i = 0; i < MESA_SHADER_TYPES; i++) {