summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2014-12-12 11:35:28 -0800
committerEric Anholt <eric@anholt.net>2015-01-10 13:54:12 +1300
commit24d94874323ef59ebc83c806497c3d826ae37b9e (patch)
treefea5b96061810de8607c167f58cc3ad9393be2b1
parent3d8188d4f898afcf4f181de29e12c5b218bbd393 (diff)
state_tracker: Fix assertion failures in conditional block movs.
If you had a conditional assignment of an array or struct (say, from the if-lowering pass), we'd try doing swizzle_for_size() on the aggregate type, and it would assertion fail due to vector_elements==0. Instead, extend emit_block_mov() to handle emitting the conditional operations, which also means we'll have appropriate writemasks/swizzles on the CMPs within a struct containing various-sized members. Fixes 20 testcases in es3conform on vc4. Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
-rw-r--r--src/mesa/state_tracker/st_glsl_to_tgsi.cpp57
1 files changed, 26 insertions, 31 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 89654344b1..c3d7793370 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -455,7 +455,8 @@ public:
void renumber_registers(void);
void emit_block_mov(ir_assignment *ir, const struct glsl_type *type,
- st_dst_reg *l, st_src_reg *r);
+ st_dst_reg *l, st_src_reg *r,
+ st_src_reg *cond, bool cond_swap);
void *mem_ctx;
};
@@ -2388,18 +2389,20 @@ glsl_to_tgsi_visitor::process_move_condition(ir_rvalue *ir)
void
glsl_to_tgsi_visitor::emit_block_mov(ir_assignment *ir, const struct glsl_type *type,
- st_dst_reg *l, st_src_reg *r)
+ st_dst_reg *l, st_src_reg *r,
+ st_src_reg *cond, bool cond_swap)
{
if (type->base_type == GLSL_TYPE_STRUCT) {
for (unsigned int i = 0; i < type->length; i++) {
- emit_block_mov(ir, type->fields.structure[i].type, l, r);
+ emit_block_mov(ir, type->fields.structure[i].type, l, r,
+ cond, cond_swap);
}
return;
}
if (type->is_array()) {
for (unsigned int i = 0; i < type->length; i++) {
- emit_block_mov(ir, type->fields.array, l, r);
+ emit_block_mov(ir, type->fields.array, l, r, cond, cond_swap);
}
return;
}
@@ -2411,7 +2414,7 @@ glsl_to_tgsi_visitor::emit_block_mov(ir_assignment *ir, const struct glsl_type *
type->vector_elements, 1);
for (int i = 0; i < type->matrix_columns; i++) {
- emit_block_mov(ir, vec_type, l, r);
+ emit_block_mov(ir, vec_type, l, r, cond, cond_swap);
}
return;
}
@@ -2419,7 +2422,22 @@ glsl_to_tgsi_visitor::emit_block_mov(ir_assignment *ir, const struct glsl_type *
assert(type->is_scalar() || type->is_vector());
r->type = type->base_type;
- emit(ir, TGSI_OPCODE_MOV, *l, *r);
+ if (cond) {
+ st_src_reg l_src = st_src_reg(*l);
+ l_src.swizzle = swizzle_for_size(type->vector_elements);
+
+ if (native_integers) {
+ emit(ir, TGSI_OPCODE_UCMP, *l, *cond,
+ cond_swap ? l_src : *r,
+ cond_swap ? *r : l_src);
+ } else {
+ emit(ir, TGSI_OPCODE_CMP, *l, *cond,
+ cond_swap ? l_src : *r,
+ cond_swap ? *r : l_src);
+ }
+ } else {
+ emit(ir, TGSI_OPCODE_MOV, *l, *r);
+ }
l->index++;
r->index++;
}
@@ -2429,7 +2447,6 @@ glsl_to_tgsi_visitor::visit(ir_assignment *ir)
{
st_dst_reg l;
st_src_reg r;
- int i;
ir->rhs->accept(this);
r = this->result;
@@ -2486,29 +2503,7 @@ glsl_to_tgsi_visitor::visit(ir_assignment *ir)
const bool switch_order = this->process_move_condition(ir->condition);
st_src_reg condition = this->result;
- for (i = 0; i < type_size(ir->lhs->type); i++) {
- st_src_reg l_src = st_src_reg(l);
- st_src_reg condition_temp = condition;
- st_src_reg op1, op2;
- l_src.swizzle = swizzle_for_size(ir->lhs->type->vector_elements);
-
- op1 = r;
- op2 = l_src;
- if (switch_order) {
- op1 = l_src;
- op2 = r;
- }
-
- if (native_integers) {
- emit(ir, TGSI_OPCODE_UCMP, l, condition_temp, op1, op2);
- }
- else {
- emit(ir, TGSI_OPCODE_CMP, l, condition_temp, op1, op2);
- }
-
- l.index++;
- r.index++;
- }
+ emit_block_mov(ir, ir->lhs->type, &l, &r, &condition, switch_order);
} else if (ir->rhs->as_expression() &&
this->instructions.get_tail() &&
ir->rhs == ((glsl_to_tgsi_instruction *)this->instructions.get_tail())->ir &&
@@ -2525,7 +2520,7 @@ glsl_to_tgsi_visitor::visit(ir_assignment *ir)
new_inst->saturate = inst->saturate;
inst->dead_mask = inst->dst.writemask;
} else {
- emit_block_mov(ir, ir->rhs->type, &l, &r);
+ emit_block_mov(ir, ir->rhs->type, &l, &r, NULL, false);
}
}