fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-27 09:50:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glsl_to_tgsi: emit multi-level structs and arrays properly.

Browse source 
This follow the code from the i965 driver, and emits the structs
and arrays recursively.

This fixes an assert in the two UBO tests
fs-struct-copy-complicated and
vs-struct-copy-complicated

These tests now pass on softpipe, with no regressions.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2012-12-10 17:20:05 +10:00
parent 2ee0b44252
commit 5cdcd7251a
1 changed files with 42 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
View file

@ -442,6 +442,9 @@ public:
void merge_registers(void);
void renumber_registers(void);
void emit_block_mov(ir_assignment *ir, const struct glsl_type *type,
st_dst_reg *l, st_src_reg *r);
void *mem_ctx;
};
@ -2243,6 +2246,44 @@ glsl_to_tgsi_visitor::process_move_condition(ir_rvalue *ir)
return switch_order;
}
void
glsl_to_tgsi_visitor::emit_block_mov(ir_assignment *ir, const struct glsl_type *type,
st_dst_reg *l, st_src_reg *r)
{
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);
}
return;
}
if (type->is_array()) {
for (unsigned int i = 0; i < type->length; i++) {
emit_block_mov(ir, type->fields.array, l, r);
}
return;
}
if (type->is_matrix()) {
const struct glsl_type *vec_type;
vec_type = glsl_type::get_instance(GLSL_TYPE_FLOAT,
type->vector_elements, 1);
for (int i = 0; i < type->matrix_columns; i++) {
emit_block_mov(ir, vec_type, l, r);
}
return;
}
assert(type->is_scalar() || type->is_vector());
r->type = type->base_type;
emit(ir, TGSI_OPCODE_MOV, *l, *r);
l->index++;
r->index++;
}
void
glsl_to_tgsi_visitor::visit(ir_assignment *ir)
{
@ -2347,15 +2388,7 @@ glsl_to_tgsi_visitor::visit(ir_assignment *ir)
new_inst->saturate = inst->saturate;
inst->dead_mask = inst->dst.writemask;
} else {
for (i = 0; i < type_size(ir->lhs->type); i++) {
if (ir->rhs->type->is_array())
r.type = ir->rhs->type->element_type()->base_type;
else if (ir->rhs->type->is_record())
r.type = ir->rhs->type->fields.structure[i].type->base_type;
emit(ir, TGSI_OPCODE_MOV, l, r);
l.index++;
r.index++;
}
emit_block_mov(ir, ir->rhs->type, &l, &r);
}
}