fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-14 06:30:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pvr: drop pvr_assert macro

Browse source 
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 <simon.perretta@imgtec.com>
Reviewed-by: Karmjit Mahil <karmjit.mahil@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39677>
This commit is contained in:
Simon Perretta 2026-02-02 15:30:46 +00:00 • committed by Marge Bot
parent 143b362c0f
commit ae29e1cf76
3 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/imagination/vulkan/pvr_arch_pass.c
View file

@ -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;

4
src/imagination/vulkan/pvr_image.c
View file

@ -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 +

11
src/imagination/vulkan/pvr_macros.h
View file

@ -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, ...) \