Mesa (master): mesa: prevent the slang code generator from aborting when faced with a sampler variable redeclaration .

[Brian Paul]

Module: Mesa
Branch: master
Commit: 7be5411ce69f0f6be1f31079b9fbdea4967358a0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7be5411ce69f0f6be1f31079b9fbdea4967358a0

Author: Sam Hocevar <sam at zoy.org>
Date:   Thu Sep 25 14:56:41 2008 +0200

mesa: prevent the slang code generator from aborting when faced with a sampler variable redeclaration.

---

 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 7006e86..72a3c0e 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) {