summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-01-22 10:34:15 -0700
committerBrian Paul <brianp@vmware.com>2009-01-22 10:34:15 -0700
commitcb136e0476a3ca4f3cb7730ccdd729ba3773e351 (patch)
tree2bb8b6274e12cee247996549e9a876ea0e73472b
parent596b8fbbbf65cef227ce60216a57d4bbfd627099 (diff)
glsl: set shader->CompileStatus in _slang_compile()
-rw-r--r--src/mesa/shader/shader_api.c5
-rw-r--r--src/mesa/shader/slang/slang_compile.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index b3d66c5bab..acee34dc5b 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 818b90b7a8..456ec4411f 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;
}