fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

linker: Fix assertion and cross-version checks for version 100.

Browse source 
Fixes an assert (min_version >= 110) which was no longer correct, and
also prohibits linking ES2 shaders with non-ES2 shaders.  I'm not
positive this is correct, but the specification doesn't seem to say.
This commit is contained in:
Kenneth Graunke 2010-08-31 09:33:58 -07:00
parent 116dc670e9
commit 5a81d057db
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/glsl/linker.cpp
View file

@ -1402,9 +1402,10 @@ link_shaders(GLcontext *ctx, struct gl_shader_program *prog)
* match shading language versions. With GLSL 1.30 and later, the versions
* of all shaders must match.
*/
assert(min_version >= 110);
assert(min_version >= 100);
assert(max_version <= 130);
if ((max_version >= 130) && (min_version != max_version)) {
if ((max_version >= 130 || min_version == 100)
&& min_version != max_version) {
linker_error_printf(prog, "all shaders must use same shading "
"language version\n");
goto done;