summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-07-02 17:05:01 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-07-02 17:05:01 -0600
commit2c9e332bceb85435aa5e4ad4d43fc97c7272bf98 (patch)
treed73cd077ffaf25c16068cd382a878f22c6911e17
parente89deed74d6848f322e5e4b826579ad74b2f2bee (diff)
mesa: when linking a shader program, make sure all the shaders compiled OK
cherry-picked from master
-rw-r--r--src/mesa/shader/slang/slang_link.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 5116cd14e55..44d779fca17 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -497,6 +497,14 @@ _slang_link(GLcontext *ctx,
_mesa_clear_shader_program_data(ctx, shProg);
+ /* check that all programs compiled successfully */
+ for (i = 0; i < shProg->NumShaders; i++) {
+ if (!shProg->Shaders[i]->CompileStatus) {
+ link_error(shProg, "linking with uncompiled shader\n");
+ return;
+ }
+ }
+
shProg->Uniforms = _mesa_new_parameter_list();
shProg->Varying = _mesa_new_parameter_list();