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

spirv: Use the new types helpers

Browse Source 
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6713>
This commit is contained in:
Jason Ekstrand
2020-09-14 16:30:16 -05:00
committed by Marge Bot
parent de295b61da
commit 8cbb6640f0
1 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/compiler/spirv/spirv_to_nir.c
View File

@@ -1366,23 +1366,12 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode,
case SpvOpTypeInt: {
int bit_size = w[2];
const bool signedness = w[3];
vtn_fail_if(bit_size != 8 && bit_size != 16 &&
bit_size != 32 && bit_size != 64,
"Invalid int bit size: %u", bit_size);
val->type->base_type = vtn_base_type_scalar;
switch (bit_size) {
case 64:
val->type->type = (signedness ? glsl_int64_t_type() : glsl_uint64_t_type());
break;
case 32:
val->type->type = (signedness ? glsl_int_type() : glsl_uint_type());
break;
case 16:
val->type->type = (signedness ? glsl_int16_t_type() : glsl_uint16_t_type());
break;
case 8:
val->type->type = (signedness ? glsl_int8_t_type() : glsl_uint8_t_type());
break;
default:
vtn_fail("Invalid int bit size: %u", bit_size);
}
val->type->type = signedness ? glsl_intN_t_type(bit_size) :
glsl_uintN_t_type(bit_size);
val->type->length = 1;
break;
}
@@ -1390,19 +1379,9 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode,
case SpvOpTypeFloat: {
int bit_size = w[2];
val->type->base_type = vtn_base_type_scalar;
switch (bit_size) {
case 16:
val->type->type = glsl_float16_t_type();
break;
case 32:
val->type->type = glsl_float_type();
break;
case 64:
val->type->type = glsl_double_type();
break;
default:
vtn_fail("Invalid float bit size: %u", bit_size);
}
vtn_fail_if(bit_size != 16 && bit_size != 32 && bit_size != 64,
"Invalid float bit size: %u", bit_size);
val->type->type = glsl_floatN_t_type(bit_size);
val->type->length = 1;
break;
}