From b18d0ef7081540b6c8d60bfd4f13792878ea1b28 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 18 Mar 2020 23:02:12 -0400 Subject: [PATCH] pan/bi: Flesh out ATEST in IR ATEST actually takes two sources and has a destination. Although the details are a little funny, we should still model this correctly. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/bifrost/bi_tables.c | 2 +- src/panfrost/bifrost/bifrost_compile.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/panfrost/bifrost/bi_tables.c b/src/panfrost/bifrost/bi_tables.c index 03d1bb72a48..72d2ccf2155 100644 --- a/src/panfrost/bifrost/bi_tables.c +++ b/src/panfrost/bifrost/bi_tables.c @@ -28,7 +28,7 @@ unsigned bi_class_props[BI_NUM_CLASSES] = { [BI_ADD] = BI_GENERIC | BI_MODS | BI_SCHED_ALL, - [BI_ATEST] = BI_SCHED_HI_LATENCY | BI_SCHED_ADD | BI_VECTOR, + [BI_ATEST] = BI_SCHED_HI_LATENCY | BI_SCHED_ADD, [BI_BRANCH] = BI_SCHED_HI_LATENCY | BI_SCHED_ADD, [BI_CMP] = BI_GENERIC | BI_MODS | BI_SCHED_ALL, [BI_BLEND] = BI_SCHED_HI_LATENCY | BI_SCHED_ADD | BI_VECTOR, diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c index 144afe61873..e19f0961e9b 100644 --- a/src/panfrost/bifrost/bifrost_compile.c +++ b/src/panfrost/bifrost/bifrost_compile.c @@ -120,7 +120,22 @@ bi_emit_frag_out(bi_context *ctx, nir_intrinsic_instr *instr) { if (!ctx->emitted_atest) { bi_instruction ins = { - .type = BI_ATEST + .type = BI_ATEST, + .src = { + BIR_INDEX_REGISTER | 60 /* TODO: RA */, + bir_src_index(&instr->src[0]) + }, + .src_types = { + nir_type_uint32, + nir_type_float32 + }, + .swizzle = { + { 0 }, + { 3, 0 } /* swizzle out the alpha */ + }, + .dest = BIR_INDEX_REGISTER | 60 /* TODO: RA */, + .dest_type = nir_type_uint32, + .writemask = 0xF }; bi_emit(ctx, ins);