OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/glsl_to_tgsi: fix 64-bit integer bit shifts

Browse Source 
Fix a bug that was caused by a type mismatch in the shift count between
GLSL and TGSI. I briefly considered adjusting the TGSI semantics, but
since both LLVM and AMD GCN require both arguments to be of the same type,
it makes more sense to keep TGSI as-is -- it reflects the underlying
implementation better.

I'm also sending out piglit tests that expose this error.

v2: use the right number of components for the temporary register

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle
2017-03-30 17:07:34 +02:00
parent c22841d8d2
commit d10fbe5159
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
View File

@@ -2102,13 +2102,23 @@ glsl_to_tgsi_visitor::visit_expression(ir_expression* ir, st_src_reg *op)
break; break;
} }
case ir_binop_lshift: case ir_binop_lshift:
if (native_integers) {
emit_asm(ir, TGSI_OPCODE_SHL, result_dst, op[0], op[1]);
break;
}
case ir_binop_rshift: case ir_binop_rshift:
if (native_integers) { if (native_integers) {
emit_asm(ir, TGSI_OPCODE_ISHR, result_dst, op[0], op[1]); unsigned opcode = ir->operation == ir_binop_lshift ? TGSI_OPCODE_SHL
: TGSI_OPCODE_ISHR;
st_src_reg count;
if (glsl_base_type_is_64bit(op[0].type)) {
/* GLSL shift operations have 32-bit shift counts, but TGSI uses
* 64 bits.
*/
count = get_temp(glsl_type::u64vec(ir->operands[1]->type->components()));
emit_asm(ir, TGSI_OPCODE_U2I64, st_dst_reg(count), op[1]);
} else {
count = op[1];
}
emit_asm(ir, opcode, result_dst, op[0], count);
break; break;
} }
case ir_binop_bit_and: case ir_binop_bit_and: