summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Clark <robdclark@gmail.com>2018-03-10 12:27:42 -0500
committerRob Clark <robdclark@gmail.com>2018-03-13 20:17:04 -0400
commit4e4428482e5eddd0427b9dcee39b60e0211d45b9 (patch)
tree4b99d4c4705c2942216a78868e2e8b3dabe6232b
parent2aad12b2afb62a7c0ea8cbf5b30496a683454a44 (diff)
nir: lower_load_const_to_scalar fix for 8/16b types
Signed-off-by: Rob Clark <robdclark@gmail.com> Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
-rw-r--r--src/compiler/nir/nir_lower_load_const_to_scalar.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/src/compiler/nir/nir_lower_load_const_to_scalar.c b/src/compiler/nir/nir_lower_load_const_to_scalar.c
index e494facfd2..39447d42c2 100644
--- a/src/compiler/nir/nir_lower_load_const_to_scalar.c
+++ b/src/compiler/nir/nir_lower_load_const_to_scalar.c
@@ -50,11 +50,22 @@ lower_load_const_instr_scalar(nir_load_const_instr *lower)
for (unsigned i = 0; i < lower->def.num_components; i++) {
nir_load_const_instr *load_comp =
nir_load_const_instr_create(b.shader, 1, lower->def.bit_size);
- if (lower->def.bit_size == 64)
- load_comp->value.f64[0] = lower->value.f64[i];
- else
+ switch (lower->def.bit_size) {
+ case 64:
+ load_comp->value.u64[0] = lower->value.u64[i];
+ break;
+ case 32:
load_comp->value.u32[0] = lower->value.u32[i];
- assert(lower->def.bit_size == 64 || lower->def.bit_size == 32);
+ break;
+ case 16:
+ load_comp->value.u16[0] = lower->value.u16[i];
+ break;
+ case 8:
+ load_comp->value.u8[0] = lower->value.u8[i];
+ break;
+ default:
+ assert(!"invalid bit size");
+ }
nir_builder_instr_insert(&b, &load_comp->instr);
loads[i] = &load_comp->def;
}