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

ir3: Don't reset immediate count to 0 after lowering

Browse source 
We need to know the immediate count even after lowering, to compute the
overall const size. Previously we were using the capacity field, but
that's unreliable and won't be available once we switch to a real
dynamic array container instead of (poorly) reinventing one.

Fixes: 86f3c0c4c2 ("ir3: simplify constlen calculation")
(cherry picked from commit 280c64d720)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41104>
This commit is contained in:
Connor Abbott 2026-04-15 14:21:42 -04:00 • committed by Eric Engestrom
parent 76f4e2078a
commit c15245f814
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2284,7 +2284,7 @@
"description": "ir3: Don't reset immediate count to 0 after lowering",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "86f3c0c4c2c0044e3b75bcb68079bbf7b5e77243",
"notes": null

1
src/freedreno/ir3/ir3_preamble.c
View file

@ -47,6 +47,5 @@ ir3_imm_const_to_preamble(struct ir3 *ir, struct ir3_shader_variant *so)
ir3_store_const(so, &build, src, dst);
}
imms->count = 0;
return true;
}

3
src/freedreno/vulkan/tu_shader.cc
View file

@ -1576,7 +1576,8 @@ tu_xs_get_immediates_packet_size_dwords(const struct ir3_shader_variant *xs)
const struct ir3_const_state *const_state = ir3_const_state(xs);
uint32_t base = const_state->allocs.max_const_offset_vec4;
const struct ir3_imm_const_state *imm_state = &xs->imm_state;
int32_t size = DIV_ROUND_UP(imm_state->count, 4);
int32_t size = xs->compiler->info->props.load_shader_consts_via_preamble ?
0 : DIV_ROUND_UP(imm_state->count, 4);
/* truncate size to avoid writing constants that shader
* does not use:

3
src/gallium/drivers/freedreno/ir3/ir3_const.h
View file

@ -302,7 +302,8 @@ ir3_emit_immediates(const struct ir3_shader_variant *v,
{
const struct ir3_const_state *const_state = ir3_const_state(v);
uint32_t base = const_state->allocs.max_const_offset_vec4;
int size = DIV_ROUND_UP(v->imm_state.count, 4);
int size = v->compiler->info->props.load_shader_consts_via_preamble ? 0 :
DIV_ROUND_UP(v->imm_state.count, 4);
/* truncate size to avoid writing constants that shader
* does not use: