Mesa (master): spirv: Drop some unneeded bit size switch statements
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sun Apr 14 20:26:09 UTC 2019
Module: Mesa
Branch: master
Commit: 893dd34702ca576707960b87045adb494ef9434d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=893dd34702ca576707960b87045adb494ef9434d
Author: Jason Ekstrand <jason at jlekstrand.net>
Date: Wed Mar 27 18:28:30 2019 -0500
spirv: Drop some unneeded bit size switch statements
Now that nir_const_value is a scalar, we don't need the switch on bit
size in order copy components around properly.
Reviewed-by: Karol Herbst <kherbst at redhat.com>
---
src/compiler/spirv/spirv_to_nir.c | 66 +++------------------------------------
1 file changed, 4 insertions(+), 62 deletions(-)
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index cae29cb6935..ef12e21eaa6 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -1748,28 +1748,8 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode,
switch (val->type->base_type) {
case vtn_base_type_vector: {
assert(glsl_type_is_vector(val->type->type));
- int bit_size = glsl_get_bit_size(val->type->type);
- for (unsigned i = 0; i < elem_count; i++) {
- switch (bit_size) {
- case 64:
- val->constant->values[0][i].u64 = elems[i]->values[0][0].u64;
- break;
- case 32:
- val->constant->values[0][i].u32 = elems[i]->values[0][0].u32;
- break;
- case 16:
- val->constant->values[0][i].u16 = elems[i]->values[0][0].u16;
- break;
- case 8:
- val->constant->values[0][i].u8 = elems[i]->values[0][0].u8;
- break;
- case 1:
- val->constant->values[0][i].b = elems[i]->values[0][0].b;
- break;
- default:
- vtn_fail("Invalid SpvOpConstantComposite bit size");
- }
- }
+ for (unsigned i = 0; i < elem_count; i++)
+ val->constant->values[0][i] = elems[i]->values[0][0];
break;
}
@@ -1928,27 +1908,8 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode,
val->constant = *c;
} else {
unsigned num_components = type->length;
- unsigned bit_size = glsl_get_bit_size(type->type);
for (unsigned i = 0; i < num_components; i++)
- switch(bit_size) {
- case 64:
- val->constant->values[0][i].u64 = (*c)->values[col][elem + i].u64;
- break;
- case 32:
- val->constant->values[0][i].u32 = (*c)->values[col][elem + i].u32;
- break;
- case 16:
- val->constant->values[0][i].u16 = (*c)->values[col][elem + i].u16;
- break;
- case 8:
- val->constant->values[0][i].u8 = (*c)->values[col][elem + i].u8;
- break;
- case 1:
- val->constant->values[0][i].b = (*c)->values[col][elem + i].b;
- break;
- default:
- vtn_fail("Invalid SpvOpCompositeExtract bit size");
- }
+ val->constant->values[0][i] = (*c)->values[col][elem + i];
}
} else {
struct vtn_value *insert =
@@ -1958,27 +1919,8 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode,
*c = insert->constant;
} else {
unsigned num_components = type->length;
- unsigned bit_size = glsl_get_bit_size(type->type);
for (unsigned i = 0; i < num_components; i++)
- switch (bit_size) {
- case 64:
- (*c)->values[col][elem + i].u64 = insert->constant->values[0][i].u64;
- break;
- case 32:
- (*c)->values[col][elem + i].u32 = insert->constant->values[0][i].u32;
- break;
- case 16:
- (*c)->values[col][elem + i].u16 = insert->constant->values[0][i].u16;
- break;
- case 8:
- (*c)->values[col][elem + i].u8 = insert->constant->values[0][i].u8;
- break;
- case 1:
- (*c)->values[col][elem + i].b = insert->constant->values[0][i].b;
- break;
- default:
- vtn_fail("Invalid SpvOpCompositeInsert bit size");
- }
+ (*c)->values[col][elem + i] = insert->constant->values[0][i];
}
}
break;
More information about the mesa-commit
mailing list