diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-07-05 00:53:13 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-07-05 00:53:13 +1000 |
| commit | 77f8167d75d0016c76812fc147c06072e5729965 (patch) | |
| tree | f610929b3fa6d62013593df797b9e05d7c1452b4 /src/mesa/shader/slang/slang_link.c | |
| parent | 6f56b527d866506a323feb19f9d8529d40034af2 (diff) | |
| parent | 194cfc7a4ed86653db34be0e331ad7c23b5334eb (diff) | |
Merge remote branch 'upstream/gallium-0.1' into gallium-0.1
Diffstat (limited to 'src/mesa/shader/slang/slang_link.c')
| -rw-r--r-- | src/mesa/shader/slang/slang_link.c | 8 |
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 dd4990ba02..f08b53e8b7 100644 --- a/src/mesa/shader/slang/slang_link.c +++ b/src/mesa/shader/slang/slang_link.c @@ -388,6 +388,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_uniform_list(); shProg->Varying = _mesa_new_parameter_list(); |