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

spirv: Add a vtn_constant_int helper

Browse Source 
Reviewed-by: Karol Herbst <kherbst@redhat.com>
This commit is contained in:
Jason Ekstrand
2019-06-06 09:53:27 -05:00
parent 93f4aa9889
commit aa11c2e75e
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/compiler/spirv/vtn_private.h
View File

@@ -716,6 +716,24 @@ vtn_constant_uint(struct vtn_builder *b, uint32_t value_id)
} }
} }
static inline int64_t
vtn_constant_int(struct vtn_builder *b, uint32_t value_id)
{
struct vtn_value *val = vtn_value(b, value_id, vtn_value_type_constant);
vtn_fail_if(val->type->base_type != vtn_base_type_scalar ||
!glsl_type_is_integer(val->type->type),
"Expected id %u to be an integer constant", value_id);
switch (glsl_get_bit_size(val->type->type)) {
case 8: return val->constant->values[0][0].i8;
case 16: return val->constant->values[0][0].i16;
case 32: return val->constant->values[0][0].i32;
case 64: return val->constant->values[0][0].i64;
default: unreachable("Invalid bit size");
}
}
struct vtn_ssa_value *vtn_ssa_value(struct vtn_builder *b, uint32_t value_id); struct vtn_ssa_value *vtn_ssa_value(struct vtn_builder *b, uint32_t value_id);
struct vtn_ssa_value *vtn_create_ssa_value(struct vtn_builder *b, struct vtn_ssa_value *vtn_create_ssa_value(struct vtn_builder *b,

18
src/compiler/spirv/vtn_variables.c
View File

@@ -2403,23 +2403,7 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode,
struct vtn_value *link_val = vtn_untyped_value(b, w[i]); struct vtn_value *link_val = vtn_untyped_value(b, w[i]);
if (link_val->value_type == vtn_value_type_constant) { if (link_val->value_type == vtn_value_type_constant) {
chain->link[idx].mode = vtn_access_mode_literal; chain->link[idx].mode = vtn_access_mode_literal;
const unsigned bit_size = glsl_get_bit_size(link_val->type->type); chain->link[idx].id = vtn_constant_int(b, w[i]);
switch (bit_size) {
case 8:
chain->link[idx].id = link_val->constant->values[0][0].i8;
break;
case 16:
chain->link[idx].id = link_val->constant->values[0][0].i16;
break;
case 32:
chain->link[idx].id = link_val->constant->values[0][0].i32;
break;
case 64:
chain->link[idx].id = link_val->constant->values[0][0].i64;
break;
default:
vtn_fail("Invalid bit size: %u", bit_size);
}
} else { } else {
chain->link[idx].mode = vtn_access_mode_id; chain->link[idx].mode = vtn_access_mode_id;
chain->link[idx].id = w[i]; chain->link[idx].id = w[i];