summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-08-18 12:06:25 -0700
committerKenneth Graunke <kenneth@whitecape.org>2010-08-18 12:08:19 -0700
commitd12cb77d85ec726a67c2099c4105df63829b45a4 (patch)
treee59807ef95f717477e9c9c8f0fce065815693e2a
parentd442a01ac14382d83cdaac87d2832315ceb3e963 (diff)
ir_constant_expression: Implement equal/notEqual for booleans.
Calls to equal(bvec, bvec) or notEqual(bvec, bvec) previously caused an assertion. Fixes piglit tests glsl-const-builtin-equal-bool and glsl-const-builtin-notEqual-bool.
-rw-r--r--src/glsl/ir_constant_expression.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index 0a924246da1..54f14d1a541 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -904,6 +904,9 @@ ir_call::constant_expression_value()
case GLSL_TYPE_FLOAT:
data.b[c] = op[0]->value.f[c] == op[1]->value.f[c];
break;
+ case GLSL_TYPE_BOOL:
+ data.b[c] = op[0]->value.b[c] == op[1]->value.b[c];
+ break;
default:
assert(!"Should not get here.");
}
@@ -1047,6 +1050,9 @@ ir_call::constant_expression_value()
case GLSL_TYPE_FLOAT:
data.b[c] = op[0]->value.f[c] != op[1]->value.f[c];
break;
+ case GLSL_TYPE_BOOL:
+ data.b[c] = op[0]->value.b[c] != op[1]->value.b[c];
+ break;
default:
assert(!"Should not get here.");
}