From 6b888a10d37f43feae272d0927d087916e9e3c0d Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 5 Aug 2008 20:12:50 -0600
Subject: mesa: glsl: additional type checking for assignments, inequalities

---
 src/mesa/shader/slang/slang_codegen.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src')

diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 036196a8d2..94497cd833 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -2889,6 +2889,10 @@ _slang_assignment_compatible(slang_assemble_ctx *A,
        t0.spec._struct->a_name != t1.spec._struct->a_name)
       return GL_FALSE;
 
+   if (t0.spec.type == SLANG_SPEC_FLOAT &&
+       t1.spec.type == SLANG_SPEC_BOOL)
+      return GL_FALSE;
+
 #if 0 /* not used just yet - causes problems elsewhere */
    if (t0.spec.type == SLANG_SPEC_INT &&
        t1.spec.type == SLANG_SPEC_FLOAT)
@@ -3237,6 +3241,18 @@ _slang_gen_compare(slang_assemble_ctx *A, slang_operation *oper,
       return NULL;
    }
 
+   if (oper->type != SLANG_OPER_EQUAL &&
+       oper->type != SLANG_OPER_NOTEQUAL) {
+      /* <, <=, >, >= can only be used with scalars */
+      if ((t0.spec.type != SLANG_SPEC_INT &&
+           t0.spec.type != SLANG_SPEC_FLOAT) ||
+          (t1.spec.type != SLANG_SPEC_INT &&
+           t1.spec.type != SLANG_SPEC_FLOAT)) {
+         slang_info_log_error(A->log, "Illegal type(s) for inequality operator");
+         return NULL;
+      }
+   }
+
    n =  new_node2(opcode,
                   _slang_gen_operation(A, &oper->children[0]),
                   _slang_gen_operation(A, &oper->children[1]));
-- 
cgit v1.2.3