summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2014-04-06 22:45:43 -0700
committerKenneth Graunke <[email protected]>2014-04-08 00:02:01 -0700
commit40d9337406709d0e5e143c51dc5d57921a91aab9 (patch)
treeef1fe12a04e6f42d0c6066539b6463ad8a901567 /src/glsl
parente14b93371cc8394bd69622f6b60cfdf8ba177360 (diff)
glsl: Validate that base types match for a number of binops.
The IR is not supposed to support implicit type conversions; we just failed to validate it. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Ian Romanick <[email protected]> Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/ir_validate.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/glsl/ir_validate.cpp b/src/glsl/ir_validate.cpp
index 527acea4c35..71defc81593 100644
--- a/src/glsl/ir_validate.cpp
+++ b/src/glsl/ir_validate.cpp
@@ -381,6 +381,9 @@ ir_validate::visit_leave(ir_expression *ir)
case ir_binop_min:
case ir_binop_max:
case ir_binop_pow:
+ assert(ir->operands[0]->type->base_type ==
+ ir->operands[1]->type->base_type);
+
if (ir->operands[0]->type->is_scalar())
assert(ir->operands[1]->type == ir->type);
else if (ir->operands[1]->type->is_scalar())