From 72aa576469054e21fe726e563a6717f13b8b7294 Mon Sep 17 00:00:00 2001 From: Matt Coster Date: Wed, 25 Oct 2023 10:08:27 +0100 Subject: [PATCH] pvr: Fill in missing {u,s}norm equivalents for tex formats Signed-off-by: Matt Coster Acked-by: Erik Faye-Lund Part-of: --- src/imagination/vulkan/pvr_formats.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/imagination/vulkan/pvr_formats.c b/src/imagination/vulkan/pvr_formats.c index 6d22fac23f8..b743b47ce83 100644 --- a/src/imagination/vulkan/pvr_formats.c +++ b/src/imagination/vulkan/pvr_formats.c @@ -247,9 +247,9 @@ static const struct pvr_tex_format_table_entry { } pvr_tex_format_table[PVR_TEX_FORMAT_COUNT] = { /* 0 */ FORMAT(U8, R8_UINT, R8_UNORM), /* 1 */ FORMAT(S8, R8_SINT, R8_SNORM), - /* 2 */ FORMAT(A4R4G4B4, NONE, A4R4G4B4_UNORM), - /* 4 */ FORMAT(A1R5G5B5, NONE, B5G5R5A1_UNORM), - /* 5 */ FORMAT(R5G6B5, NONE, B5G6R5_UNORM), + /* 2 */ FORMAT(A4R4G4B4, A4R4G4B4_UINT, A4R4G4B4_UNORM), + /* 4 */ FORMAT(A1R5G5B5, A1R5G5B5_UINT, B5G5R5A1_UNORM), + /* 5 */ FORMAT(R5G6B5, R5G6B5_UINT, B5G6R5_UNORM), /* 7 */ FORMAT(U8U8, R8G8_UINT, R8G8_UNORM), /* 8 */ FORMAT(S8S8, R8G8_SINT, R8G8_SNORM), /* 9 */ FORMAT(U16, R16_UINT, R16_UNORM), @@ -263,21 +263,21 @@ static const struct pvr_tex_format_table_entry { /* 17 */ FORMAT(F16F16, NONE, R16G16_FLOAT), /* 18 */ FORMAT(F32, NONE, R32_FLOAT), /* 22 */ FORMAT(ST8U24, Z24_UNORM_S8_UINT, Z24_UNORM_S8_UINT), - /* 24 */ FORMAT(U32, R32_UINT, NONE), - /* 25 */ FORMAT(S32, R32_SINT, NONE), + /* 24 */ FORMAT(U32, R32_UINT, R32_UNORM), + /* 25 */ FORMAT(S32, R32_SINT, R32_SNORM), /* 26 */ FORMAT(SE9995, NONE, R9G9B9E5_FLOAT), /* 28 */ FORMAT(F16F16F16F16, NONE, R16G16B16A16_FLOAT), /* 29 */ FORMAT(U16U16U16U16, R16G16B16A16_UINT, R16G16B16A16_UNORM), /* 30 */ FORMAT(S16S16S16S16, R16G16B16A16_SINT, R16G16B16A16_SNORM), /* 34 */ FORMAT(F32F32, NONE, R32G32_FLOAT), - /* 35 */ FORMAT(U32U32, R32G32_UINT, NONE), - /* 36 */ FORMAT(S32S32, R32G32_SINT, NONE), + /* 35 */ FORMAT(U32U32, R32G32_UINT, R32G32_UNORM), + /* 36 */ FORMAT(S32S32, R32G32_SINT, R32G32_SNORM), /* 61 */ FORMAT(F32F32F32F32, NONE, R32G32B32A32_FLOAT), - /* 62 */ FORMAT(U32U32U32U32, R32G32B32A32_UINT, NONE), - /* 63 */ FORMAT(S32S32S32S32, R32G32B32A32_SINT, NONE), + /* 62 */ FORMAT(U32U32U32U32, R32G32B32A32_UINT, R32G32B32A32_UNORM), + /* 63 */ FORMAT(S32S32S32S32, R32G32B32A32_SINT, R32G32B32A32_SNORM), /* 64 */ FORMAT(F32F32F32, NONE, R32G32B32_FLOAT), - /* 65 */ FORMAT(U32U32U32, R32G32B32_UINT, NONE), - /* 66 */ FORMAT(S32S32S32, R32G32B32_SINT, NONE), + /* 65 */ FORMAT(U32U32U32, R32G32B32_UINT, R32G32B32_UNORM), + /* 66 */ FORMAT(S32S32S32, R32G32B32_SINT, R32G32B32_SNORM), /* 88 */ FORMAT(F10F11F11, NONE, R11G11B10_FLOAT), };