From df69304ac829ee843cbe70b8fdd13a7a32704a48 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 14 Apr 2020 20:09:00 -0400 Subject: [PATCH] pan/bi: Ensure CONSTANT srcs have types So the next commit is valid. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/bifrost/bifrost_compile.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c index 42abe567ee7..53bb703aeaa 100644 --- a/src/panfrost/bifrost/bifrost_compile.c +++ b/src/panfrost/bifrost/bifrost_compile.c @@ -74,6 +74,7 @@ bi_load(enum bi_class T, nir_intrinsic_instr *instr) .type = T, .writemask = bi_mask_for_channels_32(instr->num_components), .src = { BIR_INDEX_CONSTANT }, + .src_types = { nir_type_uint32 }, .constant = { .u64 = nir_intrinsic_base(instr) }, }; @@ -245,6 +246,7 @@ bi_emit_sysval(bi_context *ctx, nir_instr *instr, .type = BI_LOAD_UNIFORM, .writemask = (1 << (nr_components * 4)) - 1, .src = { BIR_INDEX_CONSTANT, BIR_INDEX_ZERO }, + .src_types = { nir_type_uint32, nir_type_uint32 }, .constant = { (uniform * 16) + offset }, .dest = bir_dest_index(&nir_dest), .dest_type = nir_type_uint32, /* TODO */ -- 2.30.2