diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-26 14:09:04 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-26 14:09:04 +0100 |
| commit | fb8db63a89c4ac7fbbbc0912e1dde0871ae9c35c (patch) | |
| tree | 3d6f43bc2b9bc977216e0d8b67ea9976854d3c8c /src/mesa/shader/slang/slang_codegen.c | |
| parent | bb6a69d1696cacf828a3de21bc57678c0e4aa54a (diff) | |
| parent | 1e3a44fab068f00378613456036716d0c3772969 (diff) | |
Merge commit 'origin/master' into HEAD
Conflicts:
src/mesa/vbo/vbo.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_exec_draw.c
Diffstat (limited to 'src/mesa/shader/slang/slang_codegen.c')
| -rw-r--r-- | src/mesa/shader/slang/slang_codegen.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c index 7006e86958..72a3c0ef9e 100644 --- a/src/mesa/shader/slang/slang_codegen.c +++ b/src/mesa/shader/slang/slang_codegen.c @@ -2439,7 +2439,11 @@ _slang_gen_var_decl(slang_assemble_ctx *A, slang_variable *var) /*assert(!var->declared);*/ var->declared = GL_TRUE; - assert(!is_sampler_type(&var->type)); + if(is_sampler_type(&var->type)) { + slang_info_log_error(A->log, "redeclaration of sampler '%s'", + (char*) var->a_name); + return NULL; + } n = new_node0(IR_VAR_DECL); if (n) { |