Mesa (mesa_7_2_branch): mesa: fix logic error in GLSL linker when looking for main() shaders
Brian Paul
brianp at kemper.freedesktop.org
Mon Nov 10 19:38:57 UTC 2008
Module: Mesa
Branch: mesa_7_2_branch
Commit: 225b0e334ee8aa799588534b7d6b7af9b228094b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=225b0e334ee8aa799588534b7d6b7af9b228094b
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date: Mon Nov 10 10:45:50 2008 -0700
mesa: fix logic error in GLSL linker when looking for main() shaders
---
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 a361703..5c5a3dc 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -442,12 +442,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
More information about the mesa-commit
mailing list