panvk: Use more reliable assert for UBO pushing

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>

diff --git a/src/panfrost/vulkan/panvk_vX_meta_clear.c b/src/panfrost/vulkan/panvk_vX_meta_clear.c
index e596bf4..95aedcd 100644 (file)
--- a/src/panfrost/vulkan/panvk_vX_meta_clear.c
+++ b/src/panfrost/vulkan/panvk_vX_meta_clear.c
@@ -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,