glsl: Perform type checking on "^^" operands.

We were letting any old operand through, which generally resulted in
assertion failures later.

Fixes array-logical-xor.vert.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chad Versace <chad.versace@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Eric Anholt
2011-04-09 14:57:17 -10:00
parent 175829f1a8
commit 756c262756
+10 -3
View File
@@ -1196,9 +1196,16 @@ ast_expression::hir(exec_list *instructions,
}
case ast_logic_xor:
op[0] = this->subexpressions[0]->hir(instructions, state);
op[1] = this->subexpressions[1]->hir(instructions, state);
/* From page 33 (page 39 of the PDF) of the GLSL 1.10 spec:
*
* "The logical binary operators and (&&), or ( | | ), and
* exclusive or (^^). They operate only on two Boolean
* expressions and result in a Boolean expression."
*/
op[0] = get_scalar_boolean_operand(instructions, state, this, 0, "LHS",
&error_emitted);
op[1] = get_scalar_boolean_operand(instructions, state, this, 1, "RHS",
&error_emitted);
result = new(ctx) ir_expression(operations[this->oper], glsl_type::bool_type,
op[0], op[1]);