diff options
author | Brian Paul <[email protected]> | 2008-11-10 10:45:50 -0700 |
---|---|---|
committer | Brian Paul <[email protected]> | 2008-11-10 14:59:34 -0700 |
commit | df84f788d21d3d2f61a0c5a35b75586d3099cdd4 (patch) | |
tree | d8ebd9dcd0203732c18ad83ebaacd2d48bed7120 /src/mesa | |
parent | eb4dded5be60af4c7d45394aaa0aca24549ec3d8 (diff) |
mesa: fix logic error in GLSL linker when looking for main() shaders
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/shader/slang/slang_link.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c index 511e7406159..4361efc56e5 100644 --- a/src/mesa/shader/slang/slang_link.c +++ b/src/mesa/shader/slang/slang_link.c @@ -465,12 +465,17 @@ _slang_link(GLcontext *ctx, fragProg = NULL; for (i = 0; i < shProg->NumShaders; i++) { struct gl_shader *shader = shProg->Shaders[i]; - if (shader->Type == GL_VERTEX_SHADER && shader->Main) - vertProg = vertex_program(shader->Program); - else if (shader->Type == GL_FRAGMENT_SHADER && shader->Main) - fragProg = fragment_program(shader->Program); - else + if (shader->Type == GL_VERTEX_SHADER) { + if (shader->Main) + vertProg = vertex_program(shader->Program); + } + else if (shader->Type == GL_FRAGMENT_SHADER) { + if (shader->Main) + fragProg = fragment_program(shader->Program); + } + else { _mesa_problem(ctx, "unexpected shader target in slang_link()"); + } } #if FEATURE_es2_glsl |