fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ir_to_mesa: Only compare vector_elements present for any_nequal/all_equal

Browse source 
Fixes: glsl-mat-from-int-ctor-03
(cherry picked from commit eaa6bf59db)
This commit is contained in:
Eric Anholt 2010-09-22 13:07:57 -07:00
parent 56dc7ca916
commit 5285100502
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/mesa/program/ir_to_mesa.cpp
View file

@ -1097,6 +1097,12 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
assert(!ir->operands[operand]->type->is_matrix());
}
int vector_elements = ir->operands[0]->type->vector_elements;
if (ir->operands[1]) {
vector_elements = MAX2(vector_elements,
ir->operands[1]->type->vector_elements);
}
this->result.file = PROGRAM_UNDEFINED;
/* Storage for our result. Ideally for an assignment we'd be using
@ -1205,7 +1211,12 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
ir_to_mesa_src_reg temp = get_temp(glsl_type::vec4_type);
ir_to_mesa_emit_op2(ir, OPCODE_SNE,
ir_to_mesa_dst_reg_from_src(temp), op[0], op[1]);
ir_to_mesa_emit_op2(ir, OPCODE_DP4, result_dst, temp, temp);
if (vector_elements == 4)
ir_to_mesa_emit_op2(ir, OPCODE_DP4, result_dst, temp, temp);
else if (vector_elements == 3)
ir_to_mesa_emit_op2(ir, OPCODE_DP3, result_dst, temp, temp);
else
ir_to_mesa_emit_op2(ir, OPCODE_DP2, result_dst, temp, temp);
ir_to_mesa_emit_op2(ir, OPCODE_SEQ,
result_dst, result_src, src_reg_for_float(0.0));
} else {
@ -1219,7 +1230,12 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
ir_to_mesa_src_reg temp = get_temp(glsl_type::vec4_type);
ir_to_mesa_emit_op2(ir, OPCODE_SNE,
ir_to_mesa_dst_reg_from_src(temp), op[0], op[1]);
ir_to_mesa_emit_op2(ir, OPCODE_DP4, result_dst, temp, temp);
if (vector_elements == 4)
ir_to_mesa_emit_op2(ir, OPCODE_DP4, result_dst, temp, temp);
else if (vector_elements == 3)
ir_to_mesa_emit_op2(ir, OPCODE_DP3, result_dst, temp, temp);
else
ir_to_mesa_emit_op2(ir, OPCODE_DP2, result_dst, temp, temp);
ir_to_mesa_emit_op2(ir, OPCODE_SNE,
result_dst, result_src, src_reg_for_float(0.0));
} else {