diff options
| author | Kenneth Graunke <[email protected]> | 2010-08-31 09:33:58 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2010-09-07 17:30:38 -0700 |
| commit | 5a81d057dbbf9f4b8fbeee471df70603009c8d6b (patch) | |
| tree | b7c0af195aa8097b1c17f3f28e3a4178cfd984bb /src/glsl/linker.cpp | |
| parent | 116dc670e96f380b3982030c77d26d102109cef3 (diff) | |
linker: Fix assertion and cross-version checks for version 100.
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.
Diffstat (limited to 'src/glsl/linker.cpp')
| -rw-r--r-- | src/glsl/linker.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 02c7c298783..4d84ab39b38 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -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; |