From 3c01a6928a9d2999519ed8738197deea6f1a6d45 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 21 Aug 2019 10:50:31 -0700 Subject: [PATCH] pan/midgard,bifrost: Expand nir_const_load_to_arr Panfrost is the only user of the macro; we are better off expanding than having random stuff in nir.h. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Caio Marcelo de Oliveira Filho --- src/panfrost/bifrost/bifrost_compile.c | 2 +- src/panfrost/midgard/midgard_compile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c index 061eab11a9d..5e34b95d308 100644 --- a/src/panfrost/bifrost/bifrost_compile.c +++ b/src/panfrost/bifrost/bifrost_compile.c @@ -117,7 +117,7 @@ emit_load_const(struct compiler_context *ctx, nir_load_const_instr *instr) nir_ssa_def def = instr->def; float *v = ralloc_array(NULL, float, 1); - nir_const_load_to_arr(v, instr, f32); + nir_const_value_to_array(v, instr->value, instr->def.num_components, f32); _mesa_hash_table_u64_insert(ctx->ssa_constants, def.index + 1, v); } diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index aacd8e19989..9d11ad25ea8 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -562,7 +562,7 @@ emit_load_const(compiler_context *ctx, nir_load_const_instr *instr) nir_ssa_def def = instr->def; float *v = rzalloc_array(NULL, float, 4); - nir_const_load_to_arr(v, instr, f32); + nir_const_value_to_array(v, instr->value, instr->def.num_components, f32); /* Shifted for SSA, +1 for off-by-one */ _mesa_hash_table_u64_insert(ctx->ssa_constants, (def.index << 1) + 1, v); -- 2.30.2