From 46127a4ba747b98e76071361f3eb85480e772e43 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Thu, 29 Feb 2024 05:05:37 +0800 Subject: [PATCH] pvr: Add pvr_ prefix for vk_format_* functions in pvr_formats.h Also rename vk_format_is_normalized to pvr_vk_format_is_fully_normalized for good function name Signed-off-by: Yonggang Luo Reviewed-by: Matt Coster Part-of: --- src/imagination/vulkan/pvr_cmd_buffer.c | 2 +- src/imagination/vulkan/pvr_formats.h | 6 +++--- src/imagination/vulkan/pvr_job_common.c | 2 +- src/imagination/vulkan/pvr_job_common.h | 2 +- src/imagination/vulkan/pvr_job_transfer.c | 20 ++++++++++---------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c index f3e3a560b08..7e808cecd67 100644 --- a/src/imagination/vulkan/pvr_cmd_buffer.c +++ b/src/imagination/vulkan/pvr_cmd_buffer.c @@ -963,7 +963,7 @@ static void pvr_setup_pbe_state( &surface_params.source_format, &surface_params.gamma); - surface_params.is_normalized = vk_format_is_normalized(iview->vk.format); + surface_params.is_normalized = pvr_vk_format_is_fully_normalized(iview->vk.format); surface_params.pbe_packmode = pvr_get_pbe_packmode(iview->vk.format); surface_params.nr_components = vk_format_get_nr_components(iview->vk.format); diff --git a/src/imagination/vulkan/pvr_formats.h b/src/imagination/vulkan/pvr_formats.h index 83d2cbfcd96..2417eaeb0d3 100644 --- a/src/imagination/vulkan/pvr_formats.h +++ b/src/imagination/vulkan/pvr_formats.h @@ -253,7 +253,7 @@ void pvr_get_hw_clear_color(VkFormat vk_format, uint32_t pvr_pbe_pixel_num_loads(enum pvr_transfer_pbe_pixel_src pbe_format); -static inline bool vk_format_has_32bit_component(VkFormat vk_format) +static inline bool pvr_vk_format_has_32bit_component(VkFormat vk_format) { const struct util_format_description *desc = vk_format_description(vk_format); @@ -266,7 +266,7 @@ static inline bool vk_format_has_32bit_component(VkFormat vk_format) return false; } -static inline bool vk_format_is_normalized(VkFormat vk_format) +static inline bool pvr_vk_format_is_fully_normalized(VkFormat vk_format) { const struct util_format_description *desc = vk_format_description(vk_format); @@ -280,7 +280,7 @@ static inline bool vk_format_is_normalized(VkFormat vk_format) } static inline uint32_t -vk_format_get_common_color_channel_count(VkFormat src_format, +pvr_vk_format_get_common_color_channel_count(VkFormat src_format, VkFormat dst_format) { const struct util_format_description *dst_desc = diff --git a/src/imagination/vulkan/pvr_job_common.c b/src/imagination/vulkan/pvr_job_common.c index d4bbb530c93..ca235116e56 100644 --- a/src/imagination/vulkan/pvr_job_common.c +++ b/src/imagination/vulkan/pvr_job_common.c @@ -49,7 +49,7 @@ void pvr_pbe_get_src_format_and_gamma(VkFormat vk_format, *gamma_out = default_gamma; - if (vk_format_has_32bit_component(vk_format) || + if (pvr_vk_format_has_32bit_component(vk_format) || vk_format_is_int(vk_format)) { *src_format_out = PVRX(PBESTATE_SOURCE_FORMAT_8_PER_CHANNEL); } else if (vk_format_is_float(vk_format)) { diff --git a/src/imagination/vulkan/pvr_job_common.h b/src/imagination/vulkan/pvr_job_common.h index 2ebe2b6a7d1..38b522b60bf 100644 --- a/src/imagination/vulkan/pvr_job_common.h +++ b/src/imagination/vulkan/pvr_job_common.h @@ -49,7 +49,7 @@ enum pvr_pbe_gamma { struct pvr_pbe_surf_params { /* Swizzle for a format can be retrieved using pvr_get_format_swizzle(). */ uint8_t swizzle[4]; - /* is_normalized can be retrieved using vk_format_is_normalized(). */ + /* is_normalized can be retrieved using pvr_vk_format_is_fully_normalized(). */ bool is_normalized; /* pbe_packmode can be retrieved using pvr_get_pbe_packmode(). */ uint32_t pbe_packmode; diff --git a/src/imagination/vulkan/pvr_job_transfer.c b/src/imagination/vulkan/pvr_job_transfer.c index 87baef36fb9..000a06feea2 100644 --- a/src/imagination/vulkan/pvr_job_transfer.c +++ b/src/imagination/vulkan/pvr_job_transfer.c @@ -393,7 +393,7 @@ pvr_pbe_src_format_normal(VkFormat src_format, count = vk_format_get_blocksizebits(dst_format) / 32U; } else { count = - vk_format_get_common_color_channel_count(src_format, dst_format); + pvr_vk_format_get_common_color_channel_count(src_format, dst_format); } if (!src_signed && !dst_signed) { @@ -416,16 +416,16 @@ pvr_pbe_src_format_normal(VkFormat src_format, } } else if (vk_format_is_float(dst_format) || - vk_format_is_normalized(dst_format)) { + pvr_vk_format_is_fully_normalized(dst_format)) { bool is_float = true; if (!vk_format_is_float(src_format) && - !vk_format_is_normalized(src_format) && + !pvr_vk_format_is_fully_normalized(src_format) && !vk_format_is_block_compressed(src_format)) { return vk_error(NULL, VK_ERROR_FORMAT_NOT_SUPPORTED); } - if (vk_format_is_normalized(dst_format)) { + if (pvr_vk_format_is_fully_normalized(dst_format)) { uint32_t chan_width; is_float = false; @@ -480,13 +480,13 @@ pvr_pbe_src_format_normal(VkFormat src_format, } if (is_float) { - if (vk_format_has_32bit_component(dst_format)) { + if (pvr_vk_format_has_32bit_component(dst_format)) { uint32_t count; if (dont_force_pbe) { count = vk_format_get_blocksizebits(dst_format) / 32U; } else { - count = vk_format_get_common_color_channel_count(src_format, + count = pvr_vk_format_get_common_color_channel_count(src_format, dst_format); } @@ -743,7 +743,7 @@ pvr_pbe_setup_codegen_defaults(const struct pvr_device_info *dev_info, &surface_params->source_format, &surface_params->gamma); - surface_params->is_normalized = vk_format_is_normalized(format); + surface_params->is_normalized = pvr_vk_format_is_fully_normalized(format); surface_params->pbe_packmode = pvr_get_pbe_packmode(format); surface_params->nr_components = vk_format_get_nr_components(format); @@ -974,7 +974,7 @@ static void pvr_pbe_setup_swizzle(const struct pvr_transfer_cmd *transfer_cmd, */ } - if (vk_format_is_normalized(dst->vk_format)) { + if (pvr_vk_format_is_fully_normalized(dst->vk_format)) { if (color_fill && (dst->vk_format == VK_FORMAT_B8G8R8A8_UNORM || dst->vk_format == VK_FORMAT_R8G8B8A8_UNORM || @@ -996,7 +996,7 @@ static void pvr_pbe_setup_swizzle(const struct pvr_transfer_cmd *transfer_cmd, VkFormat src_format = transfer_cmd->sources[i].surface.vk_format; uint32_t tmp; - tmp = vk_format_get_common_color_channel_count(src_format, + tmp = pvr_vk_format_get_common_color_channel_count(src_format, dst->vk_format); count = MAX2(count, tmp); @@ -2238,7 +2238,7 @@ static VkResult pvr_pack_clear_color(VkFormat format, const uint32_t red_width = vk_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_RGB, 0U); uint32_t pbe_pack_mode = pvr_get_pbe_packmode(format); - const bool pbe_norm = vk_format_is_normalized(format); + const bool pbe_norm = pvr_vk_format_is_fully_normalized(format); if (pbe_pack_mode == PVRX(PBESTATE_PACKMODE_INVALID)) return vk_error(NULL, VK_ERROR_FORMAT_NOT_SUPPORTED);