Mesa (master): glsl: set shader->CompileStatus in _slang_compile()
Brian Paul
brianp at kemper.freedesktop.org
Thu Jan 22 17:41:32 UTC 2009
Module: Mesa
Branch: master
Commit: cb136e0476a3ca4f3cb7730ccdd729ba3773e351
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb136e0476a3ca4f3cb7730ccdd729ba3773e351
Author: Brian Paul <brianp at vmware.com>
Date: Thu Jan 22 10:34:15 2009 -0700
glsl: set shader->CompileStatus in _slang_compile()
---
src/mesa/shader/shader_api.c | 5 ++++-
src/mesa/shader/slang/slang_compile.c | 2 ++
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index b3d66c5..acee34d 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1357,7 +1357,10 @@ _mesa_compile_shader(GLcontext *ctx, GLuint shaderObj)
if (!sh)
return;
- sh->CompileStatus = _slang_compile(ctx, sh);
+ /* this call will set the sh->CompileStatus field to indicate if
+ * compilation was successful.
+ */
+ (void) _slang_compile(ctx, sh);
}
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 818b90b..456ec44 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -2794,6 +2794,8 @@ _slang_compile(GLcontext *ctx, struct gl_shader *shader)
_mesa_print_program(shader->Program);
#endif
+ shader->CompileStatus = success;
+
return success;
}
More information about the mesa-commit
mailing list