From ae29e1cf76181726a11d32c5a515d309c7e59e3e Mon Sep 17 00:00:00 2001 From: Simon Perretta Date: Mon, 2 Feb 2026 15:30:46 +0000 Subject: [PATCH] pvr: drop pvr_assert macro The only uses of the macro can be fatal assertions instead. No point keeping it around, especially as it doesn't work with the ASSERTED hint to suppress warnings either. Signed-off-by: Simon Perretta Reviewed-by: Karmjit Mahil Part-of: --- src/imagination/vulkan/pvr_arch_pass.c | 2 +- src/imagination/vulkan/pvr_image.c | 4 ++-- src/imagination/vulkan/pvr_macros.h | 11 ----------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/imagination/vulkan/pvr_arch_pass.c b/src/imagination/vulkan/pvr_arch_pass.c index 43ed9a9671c..d23f86412a7 100644 --- a/src/imagination/vulkan/pvr_arch_pass.c +++ b/src/imagination/vulkan/pvr_arch_pass.c @@ -825,7 +825,7 @@ PVR_PER_ARCH(CreateRenderPass2)(VkDevice _device, const VkAttachmentDescription2 *desc = &pCreateInfo->pAttachments[i]; struct pvr_render_pass_attachment *attachment = &pass->attachments[i]; - pvr_assert(!(desc->flags & ~VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT)); + assert(!(desc->flags & ~VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT)); attachment->load_op = desc->loadOp; attachment->store_op = desc->storeOp; diff --git a/src/imagination/vulkan/pvr_image.c b/src/imagination/vulkan/pvr_image.c index 822ecd11590..7d7acebda72 100644 --- a/src/imagination/vulkan/pvr_image.c +++ b/src/imagination/vulkan/pvr_image.c @@ -423,8 +423,8 @@ void pvr_get_image_subresource_layout(const struct pvr_image *image, const struct pvr_mip_level *mip_level = &plane->mip_levels[subresource->mipLevel]; - pvr_assert(subresource->mipLevel < image->vk.mip_levels); - pvr_assert(subresource->arrayLayer < image->vk.array_layers); + assert(subresource->mipLevel < image->vk.mip_levels); + assert(subresource->arrayLayer < image->vk.array_layers); layout->offset = plane->offset + subresource->arrayLayer * plane->layer_size + diff --git a/src/imagination/vulkan/pvr_macros.h b/src/imagination/vulkan/pvr_macros.h index 9d30253552f..131c05fbabd 100644 --- a/src/imagination/vulkan/pvr_macros.h +++ b/src/imagination/vulkan/pvr_macros.h @@ -49,17 +49,6 @@ _buffer[__offset / __nr_dwords] = __value; \ } while (0) -/* A non-fatal assert. Useful for debugging. */ -#if MESA_DEBUG -# define pvr_assert(x) \ - ({ \ - if (unlikely(!(x))) \ - mesa_loge("%s:%d ASSERT: %s", __FILE__, __LINE__, #x); \ - }) -#else -# define pvr_assert(x) -#endif - #define PVR_ARCH_NAME(name, arch) pvr_##arch##_##name #define PVR_ARCH_DISPATCH(name, arch, ...) \