From 2a96aba42e1b6866653d25da0584aa911d3313d9 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sun, 20 Feb 2022 21:29:50 -0500 Subject: [PATCH] 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 Cc: mesa-stable Part-of: (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,