Module: Mesa Branch: main Commit: db6f94f2c40ae1bae2cdae95915690843dc46a47 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=db6f94f2c40ae1bae2cdae95915690843dc46a47
Author: Matt Coster <[email protected]> Date: Tue May 2 11:37:59 2023 +0100 pvr: Correctly validate PBE accum format Fixes: dEQP-VK.pipeline.monolithic.blend.format.e5b9g9r9_ufloat_pack32 .states .color_sas_1mda_add_alpha_1msa_sas_rsub -color_1mda_cc_min_alpha_cc_cc_min -color_1mcc_1mca_rsub_alpha_1mca_1mda_min -color_sc_1mda_sub_alpha_sa_cc_min Signed-off-by: Matt Coster <[email protected]> Reported-by: James Glanville <[email protected]> Reviewed-by: Frank Binns <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22795> --- src/imagination/vulkan/pvr_formats.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/imagination/vulkan/pvr_formats.c b/src/imagination/vulkan/pvr_formats.c index ad40ba7ae81..8da5f1f3fcc 100644 --- a/src/imagination/vulkan/pvr_formats.c +++ b/src/imagination/vulkan/pvr_formats.c @@ -501,7 +501,7 @@ pvr_get_image_format_features2(const struct pvr_format *pvr_format, } } - if (pvr_get_pbe_accum_format(vk_format) != ROGUE_PBESTATE_PACKMODE_INVALID) { + if (pvr_get_pbe_accum_format(vk_format) != PVR_PBE_ACCUM_FORMAT_INVALID) { if (vk_format_is_color(vk_format)) { flags |= VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_2_BLIT_DST_BIT; @@ -509,10 +509,10 @@ pvr_get_image_format_features2(const struct pvr_format *pvr_format, if (!vk_format_is_int(vk_format)) { flags |= VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT; } - } else if (vk_format_is_depth_or_stencil(vk_format)) { - flags |= VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT | - VK_FORMAT_FEATURE_2_BLIT_DST_BIT; } + } else if (vk_format_is_depth_or_stencil(vk_format)) { + flags |= VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT | + VK_FORMAT_FEATURE_2_BLIT_DST_BIT; } if (vk_tiling == VK_IMAGE_TILING_OPTIMAL) {
