AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alyssa Rosenzweig
2022-02-20 21:29:50 -05:00
committed by Marge Bot
parent d223b7f096
commit 3c1021cd1e
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/panfrost/vulkan/panvk_vX_meta_clear.c
+2 -4
View File
@@ -69,8 +69,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,
@@ -136,8 +135,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,