pvr: do not use PVR_PER_ARCH for static function

It's not nessecary, and only makes things harder to read. Let's back out
of compiling this per-arch.

Reviewed-by: Ashish Chauhan <ashish.chauhan@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39035>
This commit is contained in:
Erik Faye-Lund 2025-12-19 12:40:11 +01:00 committed by Marge Bot
parent 2cc831d75a
commit 6696f0a1f4

View file

@ -264,8 +264,7 @@ const struct pvr_format *PVR_PER_ARCH(get_format_table)(unsigned *num_formats)
return pvr_format_table;
}
static inline const struct pvr_format *
PVR_PER_ARCH(get_format)(VkFormat vk_format)
static inline const struct pvr_format *get_format(VkFormat vk_format)
{
enum pipe_format format = vk_format_to_pipe_format(vk_format);
if (format < ARRAY_SIZE(pvr_format_table) &&
@ -290,7 +289,7 @@ pvr_get_pbe_format(VkFormat vk_format)
uint32_t PVR_PER_ARCH(get_tex_format)(VkFormat vk_format)
{
const struct pvr_format *pvr_format = PVR_PER_ARCH(get_format)(vk_format);
const struct pvr_format *pvr_format = get_format(vk_format);
if (pvr_format) {
return pvr_format->tex_format;
}
@ -301,7 +300,7 @@ uint32_t PVR_PER_ARCH(get_tex_format)(VkFormat vk_format)
uint32_t PVR_PER_ARCH(get_tex_format_aspect)(VkFormat vk_format,
VkImageAspectFlags aspect_mask)
{
const struct pvr_format *pvr_format = PVR_PER_ARCH(get_format)(vk_format);
const struct pvr_format *pvr_format = get_format(vk_format);
if (pvr_format) {
if (aspect_mask == VK_IMAGE_ASPECT_DEPTH_BIT)
return pvr_format->depth_tex_format;