Fix ast_logic_not handling to be unary, not binary.

diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp
index ca5ae8664563e238b51ec74d5776057985b372f7..3166a75cf5be434aeb9b18a6ff61498df9be8005 100644 (file)
--- a/ast_to_hir.cpp
+++ b/ast_to_hir.cpp
@@ -726,7 +726,6 @@ ast_expression::hir(exec_list *instructions,
    case ast_logic_and:
    case ast_logic_xor:
    case ast_logic_or:
-   case ast_logic_not:
       op[0] = this->subexpressions[0]->hir(instructions, state);
       op[1] = this->subexpressions[1]->hir(instructions, state);
 
@@ -748,6 +747,20 @@ ast_expression::hir(exec_list *instructions,
                                 op[0], op[1]);
       break;
 
+   case ast_logic_not:
+      op[0] = this->subexpressions[0]->hir(instructions, state);
+
+      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {
+        YYLTYPE loc = this->subexpressions[0]->get_location();
+
+        _mesa_glsl_error(& loc, state,
+                         "operand of `!' must be scalar boolean");
+      }
+
+      result = new ir_expression(operations[this->oper], glsl_type::bool_type,
+                                op[0], NULL);
+      break;
+
    case ast_mul_assign:
    case ast_div_assign:
    case ast_add_assign: