fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-10 03:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

panvk: Use more reliable assert for UBO pushing

Browse source 
The important thing isn't the number of words pushed, it's that there are no
UBOs required for us to upload. Check that instead.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15090>
(cherry picked from commit 3c1021cd1e)
This commit is contained in:
Alyssa Rosenzweig 2022-02-20 21:29:50 -05:00 • committed by Eric Engestrom
parent 03908ef6d5
commit 2a96aba42e
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -193,7 +193,7 @@
"description": "panvk: Use more reliable assert for UBO pushing",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

6
src/panfrost/vulkan/panvk_vX_meta_clear.c
View file

@ -70,8 +70,7 @@ panvk_meta_clear_color_attachment_shader(struct panfrost_device *pdev,
GENX(pan_shader_compile)(b.shader, &inputs, &binary, shader_info);
/* Make sure UBO words have been upgraded to push constants */
assert(shader_info->ubo_count == 1);
assert(shader_info->push.count == 4);
assert(shader_info->ubo_mask == 0);
mali_ptr shader =
pan_pool_upload_aligned(bin_pool, binary.data, binary.size,
@ -138,8 +137,7 @@ panvk_meta_clear_zs_attachment_shader(struct panfrost_device *pdev,
GENX(pan_shader_compile)(b.shader, &inputs, &binary, shader_info);
/* Make sure UBO words have been upgraded to push constants */
assert(shader_info->ubo_count == 1);
assert(shader_info->push.count == 2);
assert(shader_info->ubo_mask == 0);
mali_ptr shader =
pan_pool_upload_aligned(bin_pool, binary.data, binary.size,