From 90beea75f631e780182ca3c45cb623471f17d52b Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 7 Jun 2022 15:15:04 -0400 Subject: [PATCH] pan/bi: Don't reorder push with no_ubo_to_push Otherwise, load_push_constant won't work properly. This could probably be made to work if we tried hard enough, but we still don't want reordering for internal (meta) shaders which are layed out deliberately. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/bifrost/bifrost_compile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c index 55024306132..5852c7acf48 100644 --- a/src/panfrost/bifrost/bifrost_compile.c +++ b/src/panfrost/bifrost/bifrost_compile.c @@ -5022,7 +5022,8 @@ bi_compile_variant_nir(nir_shader *nir, bi_opt_dead_code_eliminate(ctx); bi_opt_cse(ctx); bi_opt_dead_code_eliminate(ctx); - bi_opt_reorder_push(ctx); + if (!ctx->inputs->no_ubo_to_push) + bi_opt_reorder_push(ctx); bi_validate(ctx, "Optimization passes"); }