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

spirv: fix the translation of SPIR-V conversion opcodes to NIR

Browse Source 
There are some SPIRV opcodes (like UConvert and SConvert) have some
expectations of the output that doesn't depend on the operands
data type. Generalize the solution of all of them.

Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Samuel Iglesias Gonsálvez
2018-03-14 08:32:08 +01:00
parent 98f35ad63c
commit ce2fd87056
1 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/compiler/spirv/vtn_alu.c
View File

@@ -355,9 +355,43 @@ vtn_nir_alu_op_for_spirv_opcode(struct vtn_builder *b,
case SpvOpConvertSToF:
case SpvOpConvertUToF:
case SpvOpSConvert:
case SpvOpFConvert:
return nir_type_conversion_op(src, dst, nir_rounding_mode_undef);
case SpvOpFConvert: {
nir_alu_type src_type;
nir_alu_type dst_type;
switch (opcode) {
case SpvOpConvertFToS:
src_type = nir_type_float;
dst_type = nir_type_int;
break;
case SpvOpConvertFToU:
src_type = nir_type_float;
dst_type = nir_type_uint;
break;
case SpvOpFConvert:
src_type = dst_type = nir_type_float;
break;
case SpvOpConvertSToF:
src_type = nir_type_int;
dst_type = nir_type_float;
break;
case SpvOpSConvert:
src_type = dst_type = nir_type_int;
break;
case SpvOpConvertUToF:
src_type = nir_type_uint;
dst_type = nir_type_float;
break;
case SpvOpUConvert:
src_type = dst_type = nir_type_uint;
break;
default:
unreachable("Invalid opcode");
}
src_type |= nir_alu_type_get_type_size(src);
dst_type |= nir_alu_type_get_type_size(dst);
return nir_type_conversion_op(src_type, dst_type, nir_rounding_mode_undef);
}
/* Derivatives: */
case SpvOpDPdx: return nir_op_fddx;
case SpvOpDPdy: return nir_op_fddy;