From 3c1021cd1ed0f60d474a6c3a6aafb0746f1da02b 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: --- src/panfrost/vulkan/panvk_vX_meta_clear.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/panfrost/vulkan/panvk_vX_meta_clear.c b/src/panfrost/vulkan/panvk_vX_meta_clear.c index e596bf4..95aedcd 100644 --- 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, -- 2.7.4