fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-28 14:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

panfrost: fix assertion failure compiling image conversion shaders

Browse source 
In 59a3e12039, we changed the UBO->push optimization in panfrost to
only push UBOs that are available in a CPU buffer. We require
first_ubo_is_default_ubo, to ensure that UBO0 will be a user buffer. We
weren't setting this flag for the image conversion shaders, so got an
assertion failure compiling them. This can be triggered by the
panvk_force_afbc_packing driconf option.

The conversion shader info UBO isn't exactly a "default" UBO in the
sense of being lowered from uniforms, but it is a user buffer, so
setting the flag should be fine.

Fixes: 59a3e12039 ("panfrost: do not push "true" UBOs")
Signed-off-by: Olivia Lee <olivia.lee@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Eric R. Smith <eric.smith@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34992>
(cherry picked from commit bed54fa402)
This commit is contained in:
Olivia Lee 2025-05-14 18:55:39 -07:00 • committed by Eric Engestrom
parent ed16a3a87c
commit b4d4799ce9
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2084,7 +2084,7 @@
"description": "panfrost: fix assertion failure compiling image conversion shaders",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "59a3e12039cde5df1451193557512b38cea0039e",
"notes": null

3
src/gallium/drivers/panfrost/pan_mod_conv_cso.c
View file

@ -472,6 +472,9 @@ panfrost_get_mod_convert_shaders(struct panfrost_context *ctx,
nir_shader *nir = \
panfrost_create_##name##_shader(screen, __VA_ARGS__); \
nir->info.num_ubos = 1; \
/* "default" UBO is maybe not correct here, but in panfrost we're */ \
/* using this as an indicator for whether UBO0 is a user UBO */ \
nir->info.first_ubo_is_default_ubo = true; \
shader->name##_cso = pipe_shader_from_nir(pctx, nir); \
}