* constant fold once split up. Handling matrices will need some more
* work.
*/
- if (expr->type->is_matrix()) {
+ if (expr->type->is_matrix() ||
+ expr->operands[0]->type->is_matrix() ||
+ (expr->operands[1] && expr->operands[1]->type->is_matrix())) {
ird->is_reduction = false;
return;
}
if (!expr)
return;
- expr->type =
+ const glsl_type *const new_type =
glsl_type::get_instance(expr->type->base_type,
- MAX2(expr->operands[0]->type->components(),
- expr->operands[1]->type->components()),
+ MAX2(expr->operands[0]->type->vector_elements,
+ expr->operands[1]->type->vector_elements),
1);
+ assert(new_type != glsl_type::error_type);
+ expr->type = new_type;
}
void