Mesa (staging/21.3): panvk: Use more reliable assert for UBO pushing

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: a6d58dbc675ed62b94d2fea46ad62250a4952d34
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a6d58dbc675ed62b94d2fea46ad62250a4952d34

Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date:   Sun Feb 20 21:29:50 2022 -0500

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 at collabora.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15090>
(cherry picked from commit 3c1021cd1ed0f60d474a6c3a6aafb0746f1da02b)

---

 .pick_status.json                         | 2 +-
 src/panfrost/vulkan/panvk_vX_meta_clear.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 3b74f3fa0a4..fcb2ccc0ebc 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -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
     },
diff --git a/src/panfrost/vulkan/panvk_vX_meta_clear.c b/src/panfrost/vulkan/panvk_vX_meta_clear.c
index 764f1455ddc..26820fdd82b 100644
--- a/src/panfrost/vulkan/panvk_vX_meta_clear.c
+++ b/src/panfrost/vulkan/panvk_vX_meta_clear.c
@@ -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,