From 0561fe3a06d61a182679eb43888797af5d8cc217 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 1 May 2020 14:53:58 -0400 Subject: [PATCH] pan/bi: Futureproof COMBINE lowering against non-u32 Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/bifrost/bi_lower_combine.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/panfrost/bifrost/bi_lower_combine.c b/src/panfrost/bifrost/bi_lower_combine.c index f915e3df227..ae9ceb9742f 100644 --- a/src/panfrost/bifrost/bi_lower_combine.c +++ b/src/panfrost/bifrost/bi_lower_combine.c @@ -198,6 +198,7 @@ bi_lower_combine(bi_context *ctx, bi_block *block) if (ins->type != BI_COMBINE) continue; unsigned R = bi_make_temp_reg(ctx); + unsigned sz = nir_alu_type_get_type_size(ins->dest_type); bi_foreach_src(ins, s) { /* We're done early for vec2/3 */ @@ -215,11 +216,13 @@ bi_lower_combine(bi_context *ctx, bi_block *block) bi_insert_combine_mov(ctx, ins, s, R); } #endif - if (ins->dest_type == nir_type_uint32) + if (sz == 32) bi_combine_mov32(ctx, ins, s, R); - else { + else if (sz == 16) { bi_combine_sel16(ctx, ins, s, R); s++; + } else { + unreachable("Unknown COMBINE size"); } } -- 2.30.2