fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/bi: Lower ubo table in indices for Valhall

Browse source 
Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27846>
This commit is contained in:
Mary Guillemard 2024-02-26 12:35:50 +01:00 • committed by Marge Bot
parent 652e1c2e13
commit 4a4698733b
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gallium/drivers/panfrost/pan_nir_lower_res_indices.c
View file

@ -95,6 +95,19 @@ lower_input_intrin(nir_builder *b, nir_intrinsic_instr *intrin,
return false;
}
static bool
lower_load_ubo_intrin(nir_builder *b, nir_intrinsic_instr *intrin)
{
b->cursor = nir_before_instr(&intrin->instr);
nir_def *new_offset =
nir_ior_imm(b, intrin->src[0].ssa, pan_res_handle(PAN_TABLE_UBO, 0));
nir_src_rewrite(&intrin->src[0], new_offset);
return true;
}
static bool
lower_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin,
const struct panfrost_compile_inputs *inputs)
@ -106,6 +119,8 @@ lower_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin,
return lower_image_intrin(b, intrin);
case nir_intrinsic_load_input:
return lower_input_intrin(b, intrin, inputs);
case nir_intrinsic_load_ubo:
return lower_load_ubo_intrin(b, intrin);
default:
return false;
}

4
src/panfrost/compiler/bi_opt_push_ubo.c
View file

@ -72,7 +72,7 @@ bi_analyze_ranges(bi_context *ctx)
if (!bi_is_direct_aligned_ubo(ins))
continue;
unsigned ubo = ins->src[1].value;
unsigned ubo = pan_res_handle_get_index(ins->src[1].value);
unsigned word = ins->src[0].value / 4;
unsigned channels = bi_opcode_props[ins->op].sr_count;
@ -139,7 +139,7 @@ bi_opt_push_ubo(bi_context *ctx)
if (!bi_is_ubo(ins))
continue;
unsigned ubo = ins->src[1].value;
unsigned ubo = pan_res_handle_get_index(ins->src[1].value);
unsigned offset = ins->src[0].value;
if (!bi_is_direct_aligned_ubo(ins)) {