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

anv: Add assert to make sure we don't push more than max_push_regs to push constants

Browse source 
As the push constant size limit is only valid in stages that don't use inline
param I had to add and call stage_has_inline_param() first.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41351>
This commit is contained in:
José Roberto de Souza 2026-05-04 13:29:56 -07:00 • committed by Marge Bot
parent bcae3b8005
commit dbfb0a3b0d
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/intel/vulkan/anv_nir_compute_push_layout.c
View file

@ -501,6 +501,15 @@ lower_to_push_data_intel(nir_builder *b,
}
}
static inline bool
stage_has_inline_param(const struct intel_device_info *devinfo, mesa_shader_stage stage)
{
return devinfo->verx10 >= 125 &&
(stage == MESA_SHADER_TASK ||
stage == MESA_SHADER_MESH ||
stage == MESA_SHADER_COMPUTE);
}
static struct anv_push_range
compute_final_push_range(const nir_shader *nir,
const struct intel_device_info *devinfo,
@ -539,11 +548,7 @@ compute_final_push_range(const nir_shader *nir,
* (unlike all Gfx stages) and so we can bound+align the allocation there
* (see anv_cmd_buffer_cs_push_constants).
*/
const bool has_inline_param =
devinfo->verx10 >= 125 &&
(nir->info.stage == MESA_SHADER_TASK ||
nir->info.stage == MESA_SHADER_MESH ||
nir->info.stage == MESA_SHADER_COMPUTE);
const bool has_inline_param = stage_has_inline_param(devinfo, nir->info.stage);
map->inline_dwords_count = 0;
@ -708,7 +713,10 @@ anv_nir_compute_push_layout(nir_shader *nir,
map->push_ranges[n_push_ranges++] = push_constant_padding_range;
}
assert(n_push_ranges <= 4);
if (!stage_has_inline_param(devinfo, nir->info.stage)) {
assert(n_push_ranges <= 4);
assert(total_push_regs <= max_push_regs);
}
struct lower_to_push_data_intel_state lower_state = {
.devinfo = devinfo,