fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 01:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pvr: Add pvr_ prefix for vk_format_* functions in pvr_formats.h

Browse source 
Also rename vk_format_is_normalized to pvr_vk_format_is_fully_normalized for good function name

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Matt Coster <matt.coster@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28266>
This commit is contained in:
Yonggang Luo 2024-02-29 05:05:37 +08:00 • committed by Marge Bot
parent 86c88369c6
commit 46127a4ba7
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

6
src/imagination/vulkan/pvr_formats.h
View file

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

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

@ -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)) {

2
src/imagination/vulkan/pvr_job_common.h
View file

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

20
src/imagination/vulkan/pvr_job_transfer.c
View file

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