Mesa (main): turnip: Replace our format table with fd6_format_table.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Oct 5 20:44:49 UTC 2021
Module: Mesa
Branch: main
Commit: 48499a8d44535e57d2042738867fa47e11168f6c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=48499a8d44535e57d2042738867fa47e11168f6c
Author: Emma Anholt <emma at anholt.net>
Date: Mon Sep 27 13:05:13 2021 -0700
turnip: Replace our format table with fd6_format_table.
Now we have a common format table with just a little bit of overriding in
turnip, which I hope we can decrease over time.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13046>
---
src/freedreno/vulkan/tu_formats.c | 374 +++-----------------------------------
src/freedreno/vulkan/tu_image.c | 3 +-
src/freedreno/vulkan/tu_private.h | 7 -
3 files changed, 30 insertions(+), 354 deletions(-)
diff --git a/src/freedreno/vulkan/tu_formats.c b/src/freedreno/vulkan/tu_formats.c
index 8a22ad70255..9ef0164c852 100644
--- a/src/freedreno/vulkan/tu_formats.c
+++ b/src/freedreno/vulkan/tu_formats.c
@@ -33,301 +33,15 @@
#include "vk_util.h"
#include "drm-uapi/drm_fourcc.h"
-#define TU6_FMT(vkfmt, hwfmt, swapfmt, valid) \
- [VK_FORMAT_##vkfmt] = { \
- .fmt = FMT6_##hwfmt, \
- .swap = swapfmt, \
- .supported = valid, \
- }
-
-#define TU6_VTC(vk, fmt, swap) TU6_FMT(vk, fmt, swap, FMT_VERTEX | FMT_TEXTURE | FMT_COLOR)
-#define TU6_xTC(vk, fmt, swap) TU6_FMT(vk, fmt, swap, FMT_TEXTURE | FMT_COLOR)
-#define TU6_Vxx(vk, fmt, swap) TU6_FMT(vk, fmt, swap, FMT_VERTEX)
-#define TU6_xTx(vk, fmt, swap) TU6_FMT(vk, fmt, swap, FMT_TEXTURE)
-#define TU6_xxx(vk, fmt, swap) TU6_FMT(vk, NONE, WZYX, 0)
-
-static const struct tu_native_format tu6_format_table[] = {
- TU6_xxx(UNDEFINED, x, x), /* 0 */
-
- /* 8-bit packed */
- TU6_xxx(R4G4_UNORM_PACK8, 4_4_UNORM, WZXY), /* 1 */
-
- /* 16-bit packed */
- TU6_xTC(R4G4B4A4_UNORM_PACK16, 4_4_4_4_UNORM, XYZW), /* 2 */
- TU6_xTC(B4G4R4A4_UNORM_PACK16, 4_4_4_4_UNORM, ZYXW), /* 3 */
- TU6_xTC(R5G6B5_UNORM_PACK16, 5_6_5_UNORM, WXYZ), /* 4 */
- TU6_xTC(B5G6R5_UNORM_PACK16, 5_6_5_UNORM, WZYX), /* 5 */
- TU6_xTC(R5G5B5A1_UNORM_PACK16, 5_5_5_1_UNORM, XYZW), /* 6 */
- TU6_xTC(B5G5R5A1_UNORM_PACK16, 5_5_5_1_UNORM, ZYXW), /* 7 */
- TU6_xTC(A1R5G5B5_UNORM_PACK16, 5_5_5_1_UNORM, WXYZ), /* 8 */
-
- /* 8-bit R */
- TU6_VTC(R8_UNORM, 8_UNORM, WZYX), /* 9 */
- TU6_VTC(R8_SNORM, 8_SNORM, WZYX), /* 10 */
- TU6_Vxx(R8_USCALED, 8_UINT, WZYX), /* 11 */
- TU6_Vxx(R8_SSCALED, 8_SINT, WZYX), /* 12 */
- TU6_VTC(R8_UINT, 8_UINT, WZYX), /* 13 */
- TU6_VTC(R8_SINT, 8_SINT, WZYX), /* 14 */
- TU6_xTC(R8_SRGB, 8_UNORM, WZYX), /* 15 */
-
- /* 16-bit RG */
- TU6_VTC(R8G8_UNORM, 8_8_UNORM, WZYX), /* 16 */
- TU6_VTC(R8G8_SNORM, 8_8_SNORM, WZYX), /* 17 */
- TU6_Vxx(R8G8_USCALED, 8_8_UINT, WZYX), /* 18 */
- TU6_Vxx(R8G8_SSCALED, 8_8_SINT, WZYX), /* 19 */
- TU6_VTC(R8G8_UINT, 8_8_UINT, WZYX), /* 20 */
- TU6_VTC(R8G8_SINT, 8_8_SINT, WZYX), /* 21 */
- TU6_xTC(R8G8_SRGB, 8_8_UNORM, WZYX), /* 22 */
-
- /* 24-bit RGB */
- TU6_Vxx(R8G8B8_UNORM, 8_8_8_UNORM, WZYX), /* 23 */
- TU6_Vxx(R8G8B8_SNORM, 8_8_8_SNORM, WZYX), /* 24 */
- TU6_Vxx(R8G8B8_USCALED, 8_8_8_UINT, WZYX), /* 25 */
- TU6_Vxx(R8G8B8_SSCALED, 8_8_8_SINT, WZYX), /* 26 */
- TU6_Vxx(R8G8B8_UINT, 8_8_8_UINT, WZYX), /* 27 */
- TU6_Vxx(R8G8B8_SINT, 8_8_8_SINT, WZYX), /* 28 */
- TU6_xxx(R8G8B8_SRGB, 8_8_8_UNORM, WZYX), /* 29 */
-
- /* 24-bit BGR */
- TU6_xxx(B8G8R8_UNORM, 8_8_8_UNORM, WXYZ), /* 30 */
- TU6_xxx(B8G8R8_SNORM, 8_8_8_SNORM, WXYZ), /* 31 */
- TU6_xxx(B8G8R8_USCALED, 8_8_8_UINT, WXYZ), /* 32 */
- TU6_xxx(B8G8R8_SSCALED, 8_8_8_SINT, WXYZ), /* 33 */
- TU6_xxx(B8G8R8_UINT, 8_8_8_UINT, WXYZ), /* 34 */
- TU6_xxx(B8G8R8_SINT, 8_8_8_SINT, WXYZ), /* 35 */
- TU6_xxx(B8G8R8_SRGB, 8_8_8_UNORM, WXYZ), /* 36 */
-
- /* 32-bit RGBA */
- TU6_VTC(R8G8B8A8_UNORM, 8_8_8_8_UNORM, WZYX), /* 37 */
- TU6_VTC(R8G8B8A8_SNORM, 8_8_8_8_SNORM, WZYX), /* 38 */
- TU6_Vxx(R8G8B8A8_USCALED, 8_8_8_8_UINT, WZYX), /* 39 */
- TU6_Vxx(R8G8B8A8_SSCALED, 8_8_8_8_SINT, WZYX), /* 40 */
- TU6_VTC(R8G8B8A8_UINT, 8_8_8_8_UINT, WZYX), /* 41 */
- TU6_VTC(R8G8B8A8_SINT, 8_8_8_8_SINT, WZYX), /* 42 */
- TU6_xTC(R8G8B8A8_SRGB, 8_8_8_8_UNORM, WZYX), /* 43 */
-
- /* 32-bit BGRA */
- TU6_VTC(B8G8R8A8_UNORM, 8_8_8_8_UNORM, WXYZ), /* 44 */
- TU6_VTC(B8G8R8A8_SNORM, 8_8_8_8_SNORM, WXYZ), /* 45 */
- TU6_Vxx(B8G8R8A8_USCALED, 8_8_8_8_UINT, WXYZ), /* 46 */
- TU6_Vxx(B8G8R8A8_SSCALED, 8_8_8_8_SINT, WXYZ), /* 47 */
- TU6_VTC(B8G8R8A8_UINT, 8_8_8_8_UINT, WXYZ), /* 48 */
- TU6_VTC(B8G8R8A8_SINT, 8_8_8_8_SINT, WXYZ), /* 49 */
- TU6_xTC(B8G8R8A8_SRGB, 8_8_8_8_UNORM, WXYZ), /* 50 */
-
- /* 32-bit packed */
- TU6_VTC(A8B8G8R8_UNORM_PACK32, 8_8_8_8_UNORM, WZYX), /* 51 */
- TU6_VTC(A8B8G8R8_SNORM_PACK32, 8_8_8_8_SNORM, WZYX), /* 52 */
- TU6_Vxx(A8B8G8R8_USCALED_PACK32, 8_8_8_8_UINT, WZYX), /* 53 */
- TU6_Vxx(A8B8G8R8_SSCALED_PACK32, 8_8_8_8_SINT, WZYX), /* 54 */
- TU6_VTC(A8B8G8R8_UINT_PACK32, 8_8_8_8_UINT, WZYX), /* 55 */
- TU6_VTC(A8B8G8R8_SINT_PACK32, 8_8_8_8_SINT, WZYX), /* 56 */
- TU6_xTC(A8B8G8R8_SRGB_PACK32, 8_8_8_8_UNORM, WZYX), /* 57 */
- TU6_VTC(A2R10G10B10_UNORM_PACK32, 10_10_10_2_UNORM, WXYZ), /* 58 */
- TU6_Vxx(A2R10G10B10_SNORM_PACK32, 10_10_10_2_SNORM, WXYZ), /* 59 */
- TU6_Vxx(A2R10G10B10_USCALED_PACK32, 10_10_10_2_UINT, WXYZ), /* 60 */
- TU6_Vxx(A2R10G10B10_SSCALED_PACK32, 10_10_10_2_SINT, WXYZ), /* 61 */
- TU6_VTC(A2R10G10B10_UINT_PACK32, 10_10_10_2_UINT, WXYZ), /* 62 */
- TU6_Vxx(A2R10G10B10_SINT_PACK32, 10_10_10_2_SINT, WXYZ), /* 63 */
- TU6_VTC(A2B10G10R10_UNORM_PACK32, 10_10_10_2_UNORM, WZYX), /* 64 */
- TU6_Vxx(A2B10G10R10_SNORM_PACK32, 10_10_10_2_SNORM, WZYX), /* 65 */
- TU6_Vxx(A2B10G10R10_USCALED_PACK32, 10_10_10_2_UINT, WZYX), /* 66 */
- TU6_Vxx(A2B10G10R10_SSCALED_PACK32, 10_10_10_2_SINT, WZYX), /* 67 */
- TU6_VTC(A2B10G10R10_UINT_PACK32, 10_10_10_2_UINT, WZYX), /* 68 */
- TU6_Vxx(A2B10G10R10_SINT_PACK32, 10_10_10_2_SINT, WZYX), /* 69 */
-
- /* 16-bit R */
- TU6_VTC(R16_UNORM, 16_UNORM, WZYX), /* 70 */
- TU6_VTC(R16_SNORM, 16_SNORM, WZYX), /* 71 */
- TU6_Vxx(R16_USCALED, 16_UINT, WZYX), /* 72 */
- TU6_Vxx(R16_SSCALED, 16_SINT, WZYX), /* 73 */
- TU6_VTC(R16_UINT, 16_UINT, WZYX), /* 74 */
- TU6_VTC(R16_SINT, 16_SINT, WZYX), /* 75 */
- TU6_VTC(R16_SFLOAT, 16_FLOAT, WZYX), /* 76 */
-
- /* 32-bit RG */
- TU6_VTC(R16G16_UNORM, 16_16_UNORM, WZYX), /* 77 */
- TU6_VTC(R16G16_SNORM, 16_16_SNORM, WZYX), /* 78 */
- TU6_Vxx(R16G16_USCALED, 16_16_UINT, WZYX), /* 79 */
- TU6_Vxx(R16G16_SSCALED, 16_16_SINT, WZYX), /* 80 */
- TU6_VTC(R16G16_UINT, 16_16_UINT, WZYX), /* 81 */
- TU6_VTC(R16G16_SINT, 16_16_SINT, WZYX), /* 82 */
- TU6_VTC(R16G16_SFLOAT, 16_16_FLOAT, WZYX), /* 83 */
-
- /* 48-bit RGB */
- TU6_Vxx(R16G16B16_UNORM, 16_16_16_UNORM, WZYX), /* 84 */
- TU6_Vxx(R16G16B16_SNORM, 16_16_16_SNORM, WZYX), /* 85 */
- TU6_Vxx(R16G16B16_USCALED, 16_16_16_UINT, WZYX), /* 86 */
- TU6_Vxx(R16G16B16_SSCALED, 16_16_16_SINT, WZYX), /* 87 */
- TU6_Vxx(R16G16B16_UINT, 16_16_16_UINT, WZYX), /* 88 */
- TU6_Vxx(R16G16B16_SINT, 16_16_16_SINT, WZYX), /* 89 */
- TU6_Vxx(R16G16B16_SFLOAT, 16_16_16_FLOAT, WZYX), /* 90 */
-
- /* 64-bit RGBA */
- TU6_VTC(R16G16B16A16_UNORM, 16_16_16_16_UNORM, WZYX), /* 91 */
- TU6_VTC(R16G16B16A16_SNORM, 16_16_16_16_SNORM, WZYX), /* 92 */
- TU6_Vxx(R16G16B16A16_USCALED, 16_16_16_16_UINT, WZYX), /* 93 */
- TU6_Vxx(R16G16B16A16_SSCALED, 16_16_16_16_SINT, WZYX), /* 94 */
- TU6_VTC(R16G16B16A16_UINT, 16_16_16_16_UINT, WZYX), /* 95 */
- TU6_VTC(R16G16B16A16_SINT, 16_16_16_16_SINT, WZYX), /* 96 */
- TU6_VTC(R16G16B16A16_SFLOAT, 16_16_16_16_FLOAT, WZYX), /* 97 */
-
- /* 32-bit R */
- TU6_VTC(R32_UINT, 32_UINT, WZYX), /* 98 */
- TU6_VTC(R32_SINT, 32_SINT, WZYX), /* 99 */
- TU6_VTC(R32_SFLOAT, 32_FLOAT, WZYX), /* 100 */
-
- /* 64-bit RG */
- TU6_VTC(R32G32_UINT, 32_32_UINT, WZYX), /* 101 */
- TU6_VTC(R32G32_SINT, 32_32_SINT, WZYX), /* 102 */
- TU6_VTC(R32G32_SFLOAT, 32_32_FLOAT, WZYX), /* 103 */
-
- /* 96-bit RGB */
- TU6_Vxx(R32G32B32_UINT, 32_32_32_UINT, WZYX), /* 104 */
- TU6_Vxx(R32G32B32_SINT, 32_32_32_SINT, WZYX), /* 105 */
- TU6_Vxx(R32G32B32_SFLOAT, 32_32_32_FLOAT, WZYX), /* 106 */
-
- /* 128-bit RGBA */
- TU6_VTC(R32G32B32A32_UINT, 32_32_32_32_UINT, WZYX), /* 107 */
- TU6_VTC(R32G32B32A32_SINT, 32_32_32_32_SINT, WZYX), /* 108 */
- TU6_VTC(R32G32B32A32_SFLOAT, 32_32_32_32_FLOAT, WZYX), /* 109 */
-
- /* 64-bit R */
- TU6_xxx(R64_UINT, 64_UINT, WZYX), /* 110 */
- TU6_xxx(R64_SINT, 64_SINT, WZYX), /* 111 */
- TU6_xxx(R64_SFLOAT, 64_FLOAT, WZYX), /* 112 */
-
- /* 128-bit RG */
- TU6_xxx(R64G64_UINT, 64_64_UINT, WZYX), /* 113 */
- TU6_xxx(R64G64_SINT, 64_64_SINT, WZYX), /* 114 */
- TU6_xxx(R64G64_SFLOAT, 64_64_FLOAT, WZYX), /* 115 */
-
- /* 192-bit RGB */
- TU6_xxx(R64G64B64_UINT, 64_64_64_UINT, WZYX), /* 116 */
- TU6_xxx(R64G64B64_SINT, 64_64_64_SINT, WZYX), /* 117 */
- TU6_xxx(R64G64B64_SFLOAT, 64_64_64_FLOAT, WZYX), /* 118 */
-
- /* 256-bit RGBA */
- TU6_xxx(R64G64B64A64_UINT, 64_64_64_64_UINT, WZYX), /* 119 */
- TU6_xxx(R64G64B64A64_SINT, 64_64_64_64_SINT, WZYX), /* 120 */
- TU6_xxx(R64G64B64A64_SFLOAT, 64_64_64_64_FLOAT, WZYX), /* 121 */
-
- /* 32-bit packed float */
- TU6_VTC(B10G11R11_UFLOAT_PACK32, 11_11_10_FLOAT, WZYX), /* 122 */
- TU6_xTx(E5B9G9R9_UFLOAT_PACK32, 9_9_9_E5_FLOAT, WZYX), /* 123 */
-
- /* depth/stencil
- * X8_D24_UNORM/D24_UNORM_S8_UINT should be Z24_UNORM_S8_UINT_AS_R8G8B8A8
- * but the format doesn't work on A630 when UBWC is disabled, so use
- * 8_8_8_8_UNORM as the default and override it when UBWC is enabled
- */
- TU6_xTC(D16_UNORM, 16_UNORM, WZYX), /* 124 */
- TU6_xTC(X8_D24_UNORM_PACK32, 8_8_8_8_UNORM, WZYX), /* 125 */
- TU6_xTC(D32_SFLOAT, 32_FLOAT, WZYX), /* 126 */
- TU6_xTC(S8_UINT, 8_UINT, WZYX), /* 127 */
- TU6_xxx(D16_UNORM_S8_UINT, X8Z16_UNORM, WZYX), /* 128 */
- TU6_xTC(D24_UNORM_S8_UINT, 8_8_8_8_UNORM, WZYX), /* 129 */
- TU6_xTC(D32_SFLOAT_S8_UINT, 32_FLOAT, WZYX), /* 130 */
-
- /* compressed */
- TU6_xTx(BC1_RGB_UNORM_BLOCK, DXT1, WZYX), /* 131 */
- TU6_xTx(BC1_RGB_SRGB_BLOCK, DXT1, WZYX), /* 132 */
- TU6_xTx(BC1_RGBA_UNORM_BLOCK, DXT1, WZYX), /* 133 */
- TU6_xTx(BC1_RGBA_SRGB_BLOCK, DXT1, WZYX), /* 134 */
- TU6_xTx(BC2_UNORM_BLOCK, DXT3, WZYX), /* 135 */
- TU6_xTx(BC2_SRGB_BLOCK, DXT3, WZYX), /* 136 */
- TU6_xTx(BC3_UNORM_BLOCK, DXT5, WZYX), /* 137 */
- TU6_xTx(BC3_SRGB_BLOCK, DXT5, WZYX), /* 138 */
- TU6_xTx(BC4_UNORM_BLOCK, RGTC1_UNORM, WZYX), /* 139 */
- TU6_xTx(BC4_SNORM_BLOCK, RGTC1_SNORM, WZYX), /* 140 */
- TU6_xTx(BC5_UNORM_BLOCK, RGTC2_UNORM, WZYX), /* 141 */
- TU6_xTx(BC5_SNORM_BLOCK, RGTC2_SNORM, WZYX), /* 142 */
- TU6_xTx(BC6H_UFLOAT_BLOCK, BPTC_UFLOAT, WZYX), /* 143 */
- TU6_xTx(BC6H_SFLOAT_BLOCK, BPTC_FLOAT, WZYX), /* 144 */
- TU6_xTx(BC7_UNORM_BLOCK, BPTC, WZYX), /* 145 */
- TU6_xTx(BC7_SRGB_BLOCK, BPTC, WZYX), /* 146 */
- TU6_xTx(ETC2_R8G8B8_UNORM_BLOCK, ETC2_RGB8, WZYX), /* 147 */
- TU6_xTx(ETC2_R8G8B8_SRGB_BLOCK, ETC2_RGB8, WZYX), /* 148 */
- TU6_xTx(ETC2_R8G8B8A1_UNORM_BLOCK, ETC2_RGB8A1, WZYX), /* 149 */
- TU6_xTx(ETC2_R8G8B8A1_SRGB_BLOCK, ETC2_RGB8A1, WZYX), /* 150 */
- TU6_xTx(ETC2_R8G8B8A8_UNORM_BLOCK, ETC2_RGBA8, WZYX), /* 151 */
- TU6_xTx(ETC2_R8G8B8A8_SRGB_BLOCK, ETC2_RGBA8, WZYX), /* 152 */
- TU6_xTx(EAC_R11_UNORM_BLOCK, ETC2_R11_UNORM, WZYX), /* 153 */
- TU6_xTx(EAC_R11_SNORM_BLOCK, ETC2_R11_SNORM, WZYX), /* 154 */
- TU6_xTx(EAC_R11G11_UNORM_BLOCK, ETC2_RG11_UNORM, WZYX), /* 155 */
- TU6_xTx(EAC_R11G11_SNORM_BLOCK, ETC2_RG11_SNORM, WZYX), /* 156 */
- TU6_xTx(ASTC_4x4_UNORM_BLOCK, ASTC_4x4, WZYX), /* 157 */
- TU6_xTx(ASTC_4x4_SRGB_BLOCK, ASTC_4x4, WZYX), /* 158 */
- TU6_xTx(ASTC_5x4_UNORM_BLOCK, ASTC_5x4, WZYX), /* 159 */
- TU6_xTx(ASTC_5x4_SRGB_BLOCK, ASTC_5x4, WZYX), /* 160 */
- TU6_xTx(ASTC_5x5_UNORM_BLOCK, ASTC_5x5, WZYX), /* 161 */
- TU6_xTx(ASTC_5x5_SRGB_BLOCK, ASTC_5x5, WZYX), /* 162 */
- TU6_xTx(ASTC_6x5_UNORM_BLOCK, ASTC_6x5, WZYX), /* 163 */
- TU6_xTx(ASTC_6x5_SRGB_BLOCK, ASTC_6x5, WZYX), /* 164 */
- TU6_xTx(ASTC_6x6_UNORM_BLOCK, ASTC_6x6, WZYX), /* 165 */
- TU6_xTx(ASTC_6x6_SRGB_BLOCK, ASTC_6x6, WZYX), /* 166 */
- TU6_xTx(ASTC_8x5_UNORM_BLOCK, ASTC_8x5, WZYX), /* 167 */
- TU6_xTx(ASTC_8x5_SRGB_BLOCK, ASTC_8x5, WZYX), /* 168 */
- TU6_xTx(ASTC_8x6_UNORM_BLOCK, ASTC_8x6, WZYX), /* 169 */
- TU6_xTx(ASTC_8x6_SRGB_BLOCK, ASTC_8x6, WZYX), /* 170 */
- TU6_xTx(ASTC_8x8_UNORM_BLOCK, ASTC_8x8, WZYX), /* 171 */
- TU6_xTx(ASTC_8x8_SRGB_BLOCK, ASTC_8x8, WZYX), /* 172 */
- TU6_xTx(ASTC_10x5_UNORM_BLOCK, ASTC_10x5, WZYX), /* 173 */
- TU6_xTx(ASTC_10x5_SRGB_BLOCK, ASTC_10x5, WZYX), /* 174 */
- TU6_xTx(ASTC_10x6_UNORM_BLOCK, ASTC_10x6, WZYX), /* 175 */
- TU6_xTx(ASTC_10x6_SRGB_BLOCK, ASTC_10x6, WZYX), /* 176 */
- TU6_xTx(ASTC_10x8_UNORM_BLOCK, ASTC_10x8, WZYX), /* 177 */
- TU6_xTx(ASTC_10x8_SRGB_BLOCK, ASTC_10x8, WZYX), /* 178 */
- TU6_xTx(ASTC_10x10_UNORM_BLOCK, ASTC_10x10, WZYX), /* 179 */
- TU6_xTx(ASTC_10x10_SRGB_BLOCK, ASTC_10x10, WZYX), /* 180 */
- TU6_xTx(ASTC_12x10_UNORM_BLOCK, ASTC_12x10, WZYX), /* 181 */
- TU6_xTx(ASTC_12x10_SRGB_BLOCK, ASTC_12x10, WZYX), /* 182 */
- TU6_xTx(ASTC_12x12_UNORM_BLOCK, ASTC_12x12, WZYX), /* 183 */
- TU6_xTx(ASTC_12x12_SRGB_BLOCK, ASTC_12x12, WZYX), /* 184 */
-};
-
-#undef TU6_FMT
-#define TU6_FMT(vkfmt, hwfmt, swapfmt, valid) \
- case VK_FORMAT_##vkfmt: \
- fmt = (struct tu_native_format) { \
- .fmt = FMT6_##hwfmt, \
- .swap = swapfmt, \
- .supported = valid, \
- }; break;
-
-static struct tu_native_format
-tu6_get_native_format(VkFormat format)
-{
- struct tu_native_format fmt = {};
-
- if (format < ARRAY_SIZE(tu6_format_table)) {
- fmt = tu6_format_table[format];
- } else {
- switch (format) {
- TU6_xTx(G8B8G8R8_422_UNORM, R8G8R8B8_422_UNORM, WZYX)
- TU6_xTx(B8G8R8G8_422_UNORM, G8R8B8R8_422_UNORM, WZYX)
- TU6_xTx(G8_B8_R8_3PLANE_420_UNORM, R8_G8_B8_3PLANE_420_UNORM, WZYX)
- TU6_xTx(G8_B8R8_2PLANE_420_UNORM, R8_G8B8_2PLANE_420_UNORM, WZYX)
- TU6_xTC(A4R4G4B4_UNORM_PACK16_EXT, 4_4_4_4_UNORM, WXYZ)
- TU6_xTC(A4B4G4R4_UNORM_PACK16_EXT, 4_4_4_4_UNORM, WZYX)
- default:
- break;
- }
- }
-
- if (fmt.supported && vk_format_to_pipe_format(format) == PIPE_FORMAT_NONE) {
- tu_finishme("vk_format %d missing matching pipe format.\n", format);
- fmt.supported = false;
- }
-
- return fmt;
-}
-
struct tu_native_format
-tu6_format_vtx(VkFormat format)
+tu6_format_vtx(VkFormat vk_format)
{
- struct tu_native_format fmt = tu6_get_native_format(format);
- assert(fmt.supported & FMT_VERTEX);
+ enum pipe_format format = vk_format_to_pipe_format(vk_format);
+ struct tu_native_format fmt = {
+ .fmt = fd6_vertex_format(format),
+ .swap = fd6_vertex_swap(format),
+ };
+ assert(fmt.fmt != FMT6_NONE);
return fmt;
}
@@ -366,35 +80,22 @@ tu_vk_format_to_pipe_format(VkFormat vk_format)
static struct tu_native_format
tu6_format_color_unchecked(VkFormat vk_format, enum a6xx_tile_mode tile_mode)
{
- struct tu_native_format fmt = tu6_get_native_format(vk_format);
-
enum pipe_format format = tu_vk_format_to_pipe_format(vk_format);
- enum a6xx_format fd_format = fd6_color_format(format, tile_mode);
- enum a3xx_color_swap swap = fd6_color_swap(format, tile_mode);
+ struct tu_native_format fmt = {
+ .fmt = fd6_color_format(format, tile_mode),
+ .swap = fd6_color_swap(format, tile_mode),
+ };
switch (format) {
case PIPE_FORMAT_Z24X8_UNORM:
case PIPE_FORMAT_Z24_UNORM_S8_UINT:
- fd_format = FMT6_8_8_8_8_UNORM;
+ fmt.fmt = FMT6_8_8_8_8_UNORM;
break;
default:
break;
}
- if (fmt.fmt == FMT6_10_10_10_2_UNORM)
- fmt.fmt = FMT6_10_10_10_2_UNORM_DEST;
-
- if (tile_mode)
- fmt.swap = WZYX;
-
- if (fmt.supported & FMT_COLOR) {
- assert(swap == fmt.swap);
- assert(fd_format == fmt.fmt);
- } else {
- fmt.fmt = fd_format;
- }
-
return fmt;
}
@@ -408,7 +109,7 @@ struct tu_native_format
tu6_format_color(VkFormat vk_format, enum a6xx_tile_mode tile_mode)
{
struct tu_native_format fmt = tu6_format_color_unchecked(vk_format, tile_mode);
- assert(fmt.supported & FMT_COLOR);
+ assert(fmt.fmt != FMT6_NONE);
return fmt;
}
@@ -416,17 +117,17 @@ static struct tu_native_format
tu6_format_texture_unchecked(VkFormat vk_format, enum a6xx_tile_mode tile_mode)
{
enum pipe_format format = tu_vk_format_to_pipe_format(vk_format);
- struct tu_native_format fmt = tu6_get_native_format(vk_format);
-
- enum a6xx_format fd_format = fd6_texture_format(format, tile_mode);
- enum a3xx_color_swap swap = fd6_texture_swap(format, tile_mode);
+ struct tu_native_format fmt = {
+ .fmt = fd6_texture_format(format, tile_mode),
+ .swap = fd6_texture_swap(format, tile_mode),
+ };
/* No texturing support for NPOT textures yet. See
* https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5536
*/
if (util_format_is_plain(format) &&
!util_is_power_of_two_nonzero(util_format_get_blocksize(format))) {
- fd_format = FMT6_NONE;
+ fmt.fmt = FMT6_NONE;
}
switch (format) {
@@ -436,30 +137,13 @@ tu6_format_texture_unchecked(VkFormat vk_format, enum a6xx_tile_mode tile_mode)
* FMT6_Z24_UNORM_S8_UINT_AS_R8G8B8A8 (blits) for this format, while we use
* FMT6_8_8_8_8_UNORM or FMT6_Z24_UNORM_S8_UINT_AS_R8G8B8A8
*/
- fd_format = FMT6_8_8_8_8_UNORM;
+ fmt.fmt = FMT6_8_8_8_8_UNORM;
break;
default:
break;
}
- if (!tile_mode) {
- /* different from format table when used as linear src */
- if (format == PIPE_FORMAT_A1B5G5R5_UNORM)
- fmt.fmt = FMT6_1_5_5_5_UNORM, fmt.swap = WXYZ;
- if (format == PIPE_FORMAT_A1R5G5B5_UNORM)
- fmt.fmt = FMT6_1_5_5_5_UNORM, fmt.swap = WZYX;
- } else {
- fmt.swap = WZYX;
- }
-
- if (fmt.supported & FMT_TEXTURE) {
- assert(swap == fmt.swap);
- assert(fd_format == fmt.fmt);
- } else {
- fmt.fmt = fd_format;
- }
-
return fmt;
}
@@ -467,7 +151,7 @@ struct tu_native_format
tu6_format_texture(VkFormat vk_format, enum a6xx_tile_mode tile_mode)
{
struct tu_native_format fmt = tu6_format_texture_unchecked(vk_format, tile_mode);
- assert(fmt.supported & FMT_TEXTURE);
+ assert(fmt.fmt != FMT6_NONE);
return fmt;
}
@@ -486,24 +170,21 @@ tu_physical_device_get_format_properties(
VkFormatFeatureFlags linear = 0, optimal = 0, buffer = 0;
enum pipe_format format = tu_vk_format_to_pipe_format(vk_format);
const struct util_format_description *desc = util_format_description(format);
- const struct tu_native_format native_fmt = tu6_get_native_format(vk_format);
bool supported_vtx = tu6_format_vtx_supported(vk_format);
bool supported_color = tu6_format_color_supported(vk_format);
bool supported_tex = tu6_format_texture_supported(vk_format);
- assert(supported_vtx == !!(native_fmt.supported & FMT_VERTEX));
- assert(supported_color == !!(native_fmt.supported & FMT_COLOR));
- assert(supported_tex == !!(native_fmt.supported & FMT_TEXTURE));
- if (format == PIPE_FORMAT_NONE || !native_fmt.supported) {
+ if (format == PIPE_FORMAT_NONE ||
+ !(supported_vtx || supported_color || supported_tex)) {
goto end;
}
buffer |= VK_FORMAT_FEATURE_TRANSFER_SRC_BIT | VK_FORMAT_FEATURE_TRANSFER_DST_BIT;
- if (native_fmt.supported & FMT_VERTEX)
+ if (supported_vtx)
buffer |= VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT;
- if (native_fmt.supported & FMT_TEXTURE) {
+ if (supported_tex) {
optimal |= VK_FORMAT_FEATURE_TRANSFER_SRC_BIT |
VK_FORMAT_FEATURE_TRANSFER_DST_BIT |
VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT |
@@ -530,8 +211,8 @@ tu_physical_device_get_format_properties(
}
}
- if (native_fmt.supported & FMT_COLOR) {
- assert(native_fmt.supported & FMT_TEXTURE);
+ if (supported_color) {
+ assert(supported_tex);
optimal |= VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT |
VK_FORMAT_FEATURE_BLIT_DST_BIT;
@@ -542,7 +223,8 @@ tu_physical_device_get_format_properties(
* after we enable shaderStorageImageReadWithoutFormat and there are
* tests for these formats.
*/
- if (native_fmt.swap == WZYX) {
+ struct tu_native_format tex = tu6_format_texture(vk_format, TILE6_LINEAR);
+ if (tex.swap == WZYX && tex.fmt != FMT6_1_5_5_5_UNORM) {
optimal |= VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT;
buffer |= VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT;
}
diff --git a/src/freedreno/vulkan/tu_image.c b/src/freedreno/vulkan/tu_image.c
index 6b5d8eed9f8..16edbe89ade 100644
--- a/src/freedreno/vulkan/tu_image.c
+++ b/src/freedreno/vulkan/tu_image.c
@@ -26,6 +26,7 @@
*/
#include "tu_private.h"
+#include "fdl/fd6_format_table.h"
#include "util/debug.h"
#include "util/u_atomic.h"
@@ -379,7 +380,7 @@ tu_image_view_init(struct tu_image_view *iview,
/* Don't set fields that are only used for attachments/blit dest if COLOR
* is unsupported.
*/
- if (!(fmt.supported & FMT_COLOR))
+ if (!tu6_format_color_supported(format))
return;
struct tu_native_format cfmt = tu6_format_color(format, layout->tile_mode);
diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h
index 26278528b08..ad5b4c06249 100644
--- a/src/freedreno/vulkan/tu_private.h
+++ b/src/freedreno/vulkan/tu_private.h
@@ -1365,18 +1365,11 @@ tu_store_gmem_attachment(struct tu_cmd_buffer *cmd,
uint32_t a,
uint32_t gmem_a);
-enum tu_supported_formats {
- FMT_VERTEX = 1,
- FMT_TEXTURE = 2,
- FMT_COLOR = 4,
-};
-
struct tu_native_format
{
enum a6xx_format fmt : 8;
enum a3xx_color_swap swap : 8;
enum a6xx_tile_mode tile_mode : 8;
- enum tu_supported_formats supported : 8;
};
bool tu6_format_vtx_supported(VkFormat format);
More information about the mesa-commit
mailing list