fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-23 07:20:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

st/glsl_to_tgsi: fix textureGatherOffset with indirectly loaded offsets

Browse source 
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Nicolai Hähnle 2016-10-10 11:44:03 +02:00
parent b234e37765
commit 1d7685e52c
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -560,6 +560,7 @@ public:
unsigned *index,
st_src_reg *indirect,
unsigned *location);
st_src_reg canonicalize_gather_offset(st_src_reg offset);
bool try_emit_mad(ir_expression *ir,
int mul_operand);
@ -3970,6 +3971,20 @@ glsl_to_tgsi_visitor::get_deref_offsets(ir_dereference *ir,
}
}
st_src_reg
glsl_to_tgsi_visitor::canonicalize_gather_offset(st_src_reg offset)
{
if (offset.reladdr || offset.reladdr2) {
st_src_reg tmp = get_temp(glsl_type::ivec2_type);
st_dst_reg tmp_dst = st_dst_reg(tmp);
tmp_dst.writemask = WRITEMASK_XY;
emit_asm(NULL, TGSI_OPCODE_MOV, tmp_dst, offset);
return tmp;
}
return offset;
}
void
glsl_to_tgsi_visitor::visit(ir_texture *ir)
{
@ -4095,9 +4110,10 @@ glsl_to_tgsi_visitor::visit(ir_texture *ir)
offset[i].index += i * type_size(elt_type);
offset[i].type = elt_type->base_type;
offset[i].swizzle = swizzle_for_size(elt_type->vector_elements);
offset[i] = canonicalize_gather_offset(offset[i]);
}
} else {
offset[0] = this->result;
offset[0] = canonicalize_gather_offset(this->result);
}
}
break;