From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Wed, 15 Apr 2020 00:09:00 +0000 (-0400)
Subject: pan/bi: Ensure CONSTANT srcs have types
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=df69304ac829ee843cbe70b8fdd13a7a32704a48;p=mesa.git

pan/bi: Ensure CONSTANT srcs have types

So the next commit is valid.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4615>
---

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 */