From bc0ce3848f04bd046e204e96f6a911008f49a454 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Thu, 28 Mar 2024 17:30:22 -0500 Subject: [PATCH] nil: Re-organize the format table For normal color formats, sort them by largest component size then by number of components. This should make things easier to find. Part-of: --- src/nouveau/nil/nil_formats.csv | 237 +++++++++++++++++--------------- 1 file changed, 123 insertions(+), 114 deletions(-) diff --git a/src/nouveau/nil/nil_formats.csv b/src/nouveau/nil/nil_formats.csv index 64d00a394a6..b4acea8fee4 100644 --- a/src/nouveau/nil/nil_formats.csv +++ b/src/nouveau/nil/nil_formats.csv @@ -24,6 +24,34 @@ # name czt tcs type src support hw +R1_UNORM , NONE , R1 , NNNN , R001 , T + +A4B4G4R4_UNORM , NONE , A4B4G4R4 , NNNN , ABGR , T +A4R4G4B4_UNORM , NONE , A4B4G4R4 , NNNN , GBAR , T +B4G4R4A4_UNORM , NONE , A4B4G4R4 , NNNN , BGRA , T +B4G4R4X4_UNORM , NONE , A4B4G4R4 , NNNN , BGR1 , T +R4G4B4A4_UNORM , NONE , A4B4G4R4 , NNNN , RGBA , T +R4G4B4X4_UNORM , NONE , A4B4G4R4 , NNNN , RGB1 , T + +B5G6R5_UNORM , R5G6B5 , B5G6R5 , NNNN , BGR1 , CTAD +R5G6B5_UNORM , NONE , B5G6R5 , NNNN , RGB1 , T +R5G5B5A1_UNORM , NONE , A1B5G5R5 , NNNN , RGBA , T +B5G5R5A1_UNORM , A1R5G5B5 , A1B5G5R5 , NNNN , BGRA , CTAD +B5G5R5X1_UNORM , X1R5G5B5 , A1B5G5R5 , NNNN , BGR1 , CTAD + +R8_UNORM , R8 , R8 , NNNN , R001 , CTBSA +R8_SNORM , RN8 , R8 , SSSS , R001 , CTBSA +R8_SINT , RS8 , R8 , IIII , R001 , CTBS +R8_UINT , RU8 , R8 , UUUU , R001 , CTBS +R8_SRGB , NONE , R8 , NNNN , R001 , T + +R8G8_UNORM , G8R8 , G8R8 , NNNN , RG01 , CTBSA +R8G8_SNORM , GN8RN8 , G8R8 , SSSS , RG01 , CTBSA +R8G8_SINT , GS8RS8 , G8R8 , IIII , RG01 , CTBS +R8G8_UINT , GU8RU8 , G8R8 , UUUU , RG01 , CTBS +# On Fermi+, the green component doesn't get decoding? +# R8G8_SRGB , NONE , G8R8 , NNNN , RG01 , T + # BGRA display formats B8G8R8A8_UNORM , A8R8G8B8 , A8B8G8R8 , NNNN , BGRA , CTBASD B8G8R8X8_UNORM , X8R8G8B8 , A8B8G8R8 , NNNN , BGR1 , CTAD @@ -34,6 +62,77 @@ R8G8B8X8_UNORM , X8B8G8R8 , A8B8G8R8 , NNNN , RGB R8G8B8A8_SRGB , A8BL8GL8RL8 , A8B8G8R8 , NNNN , RGBA , CTA R8G8B8X8_SRGB , X8BL8GL8RL8 , A8B8G8R8 , NNNN , RGB1 , CTA +R8G8B8A8_SNORM , AN8BN8GN8RN8 , A8B8G8R8 , SSSS , RGBA , CTBSA +R8G8B8A8_SINT , AS8BS8GS8RS8 , A8B8G8R8 , IIII , RGBA , CTBS +R8G8B8A8_UINT , AU8BU8GU8RU8 , A8B8G8R8 , UUUU , RGBA , CTBS +R8G8B8X8_SNORM , AN8BN8GN8RN8 , A8B8G8R8 , SSSS , RGB1 , T +R8G8B8X8_SINT , AS8BS8GS8RS8 , A8B8G8R8 , IIII , RGB1 , CT +R8G8B8X8_UINT , AU8BU8GU8RU8 , A8B8G8R8 , UUUU , RGB1 , CT + +R9G9B9E5_FLOAT , NONE , E5B9G9R9_SHAREDEXP, FFFF , RGB1 , T + +R10G10B10A2_UNORM , A2B10G10R10 , A2B10G10R10 , NNNN , RGBA , TCBASD +R10G10B10X2_UNORM , A2B10G10R10 , A2B10G10R10 , NNNN , RGB1 , T +B10G10R10A2_UNORM , A2R10G10B10 , A2B10G10R10 , NNNN , BGRA , CTA +B10G10R10X2_UNORM , A2R10G10B10 , A2B10G10R10 , NNNN , BGR1 , T +R10G10B10A2_SNORM , NONE , A2B10G10R10 , SSSS , RGBA , T +B10G10R10A2_SNORM , NONE , A2B10G10R10 , SSSS , BGRA , T +R10G10B10A2_UINT , AU2BU10GU10RU10 , A2B10G10R10 , UUUU , RGBA , CTBS +B10G10R10A2_UINT , NONE , A2B10G10R10 , UUUU , BGRA , TB + +R11G11B10_FLOAT , BF10GF11RF11 , BF10GF11RF11 , FFFF , RGB1 , CTBSA + +R16_FLOAT , RF16 , R16 , FFFF , R001 , CTBSA +R16_UNORM , R16 , R16 , NNNN , R001 , CTBSA +R16_SNORM , RN16 , R16 , SSSS , R001 , CTBSA +R16_SINT , RS16 , R16 , IIII , R001 , CTBS +R16_UINT , RU16 , R16 , UUUU , R001 , CTBS + +R16G16_FLOAT , RF16_GF16 , R16_G16 , FFFF , RG01 , CTBSA +R16G16_UNORM , R16_G16 , R16_G16 , NNNN , RG01 , CTBSA +R16G16_SNORM , RN16_GN16 , R16_G16 , SSSS , RG01 , CTBSA +R16G16_SINT , RS16_GS16 , R16_G16 , IIII , RG01 , CTBS +R16G16_UINT , RU16_GU16 , R16_G16 , UUUU , RG01 , CTBS + +R16G16B16A16_FLOAT , RF16_GF16_BF16_AF16 , R16_G16_B16_A16 , FFFF , RGBA , CTBSA +R16G16B16A16_UNORM , R16_G16_B16_A16 , R16_G16_B16_A16 , NNNN , RGBA , CTBSA +R16G16B16A16_SNORM , RN16_GN16_BN16_AN16 , R16_G16_B16_A16 , SSSS , RGBA , CTBSA +R16G16B16A16_SINT , RS16_GS16_BS16_AS16 , R16_G16_B16_A16 , IIII , RGBA , CTBS +R16G16B16A16_UINT , RU16_GU16_BU16_AU16 , R16_G16_B16_A16 , UUUU , RGBA , CTBS +R16G16B16X16_FLOAT , RF16_GF16_BF16_X16 , R16_G16_B16_A16 , FFFF , RGB1 , CTA +R16G16B16X16_UNORM , R16_G16_B16_A16 , R16_G16_B16_A16 , NNNN , RGB1 , T +R16G16B16X16_SNORM , RN16_GN16_BN16_AN16 , R16_G16_B16_A16 , SSSS , RGB1 , T +R16G16B16X16_SINT , RS16_GS16_BS16_AS16 , R16_G16_B16_A16 , IIII , RGB1 , CT +R16G16B16X16_UINT , RU16_GU16_BU16_AU16 , R16_G16_B16_A16 , UUUU , RGB1 , CT + +R32_FLOAT , RF32 , R32 , FFFF , R001 , CTBSA +R32_UNORM , NONE , R32 , NNNN , R001 , T +R32_SNORM , NONE , R32 , SSSS , R001 , T +R32_SINT , RS32 , R32 , IIII , R001 , CTBS +R32_UINT , RU32 , R32 , UUUU , R001 , CTBS + +R32G32_FLOAT , RF32_GF32 , R32_G32 , FFFF , RG01 , CTBSA +R32G32_UNORM , NONE , R32_G32 , NNNN , RG01 , T +R32G32_SNORM , NONE , R32_G32 , SSSS , RG01 , T +R32G32_SINT , RS32_GS32 , R32_G32 , IIII , RG01 , CTBS +R32G32_UINT , RU32_GU32 , R32_G32 , UUUU , RG01 , CTBS + +R32G32B32_FLOAT , NONE , R32_G32_B32 , FFFF , RGB1 , TB +R32G32B32_SINT , NONE , R32_G32_B32 , IIII , RGB1 , TB +R32G32B32_UINT , NONE , R32_G32_B32 , UUUU , RGB1 , TB + +R32G32B32A32_FLOAT , RF32_GF32_BF32_AF32 , R32_G32_B32_A32 , FFFF , RGBA , CTBSA +R32G32B32A32_UNORM , NONE , R32_G32_B32_A32 , NNNN , RGBA , T +R32G32B32A32_SNORM , NONE , R32_G32_B32_A32 , SSSS , RGBA , T +R32G32B32A32_SINT , RS32_GS32_BS32_AS32 , R32_G32_B32_A32 , IIII , RGBA , CTBS +R32G32B32A32_UINT , RU32_GU32_BU32_AU32 , R32_G32_B32_A32 , UUUU , RGBA , CTBS +R32G32B32X32_FLOAT , RF32_GF32_BF32_X32 , R32_G32_B32_A32 , FFFF , RGB1 , CTA +R32G32B32X32_SINT , RS32_GS32_BS32_X32 , R32_G32_B32_A32 , IIII , RGB1 , CT +R32G32B32X32_UINT , RU32_GU32_BU32_X32 , R32_G32_B32_A32 , UUUU , RGB1 , CT + +R64_SINT , NONE , R32_G32 , IIII , RG01 , S +R64_UINT , NONE , R32_G32 , UUUU , RG01 , S + # Depth/stencil formats Z16_UNORM , Z16 , Z16 , NUUU , R001 , TZ , Maxwell Z32_FLOAT , ZF32 , ZF32 , FUUU , R001 , TZ @@ -49,31 +148,7 @@ X24S8_UINT , NONE , G8R24 , UUUU , G00 S8X24_UINT , NONE , G24R8 , UUUU , R001 , T X32_S8X24_UINT , NONE , R32_B24G8 , UUUU , G001 , T -B5G6R5_UNORM , R5G6B5 , B5G6R5 , NNNN , BGR1 , CTAD -R5G6B5_UNORM , NONE , B5G6R5 , NNNN , RGB1 , T -R5G5B5A1_UNORM , NONE , A1B5G5R5 , NNNN , RGBA , T -B5G5R5A1_UNORM , A1R5G5B5 , A1B5G5R5 , NNNN , BGRA , CTAD -B5G5R5X1_UNORM , X1R5G5B5 , A1B5G5R5 , NNNN , BGR1 , CTAD -A4B4G4R4_UNORM , NONE , A4B4G4R4 , NNNN , ABGR , T -A4R4G4B4_UNORM , NONE , A4B4G4R4 , NNNN , GBAR , T -B4G4R4A4_UNORM , NONE , A4B4G4R4 , NNNN , BGRA , T -B4G4R4X4_UNORM , NONE , A4B4G4R4 , NNNN , BGR1 , T -R4G4B4A4_UNORM , NONE , A4B4G4R4 , NNNN , RGBA , T -R4G4B4X4_UNORM , NONE , A4B4G4R4 , NNNN , RGB1 , T - -R9G9B9E5_FLOAT , NONE , E5B9G9R9_SHAREDEXP, FFFF , RGB1 , T - -R10G10B10A2_UNORM , A2B10G10R10 , A2B10G10R10 , NNNN , RGBA , TCBASD -R10G10B10X2_UNORM , A2B10G10R10 , A2B10G10R10 , NNNN , RGB1 , T -B10G10R10A2_UNORM , A2R10G10B10 , A2B10G10R10 , NNNN , BGRA , CTA -B10G10R10X2_UNORM , A2R10G10B10 , A2B10G10R10 , NNNN , BGR1 , T -R10G10B10A2_SNORM , NONE , A2B10G10R10 , SSSS , RGBA , T -B10G10R10A2_SNORM , NONE , A2B10G10R10 , SSSS , BGRA , T -R10G10B10A2_UINT , AU2BU10GU10RU10 , A2B10G10R10 , UUUU , RGBA , CTBS -B10G10R10A2_UINT , NONE , A2B10G10R10 , UUUU , BGRA , TB - -R11G11B10_FLOAT , BF10GF11RF11 , BF10GF11RF11 , FFFF , RGB1 , CTBSA - +# Luminance formats L8_UNORM , R8 , R8 , NNNN , RRR1 , CTA L8_SRGB , NONE , R8 , NNNN , RRR1 , T L8_SNORM , RN8 , R8 , SSSS , RRR1 , CTA @@ -88,6 +163,7 @@ L32_FLOAT , RF32 , R32 , FFFF , RRR L32_SINT , RS32 , R32 , IIII , RRR1 , CT L32_UINT , RU32 , R32 , UUUU , RRR1 , CT +# Intensity formats I8_UNORM , R8 , R8 , NNNN , RRRR , CT I8_SNORM , RN8 , R8 , SSSS , RRRR , CT I8_SINT , RS8 , R8 , IIII , RRRR , CT @@ -101,6 +177,7 @@ I32_FLOAT , RF32 , R32 , FFFF , RRR I32_SINT , RS32 , R32 , IIII , RRRR , CT I32_UINT , RU32 , R32 , UUUU , RRRR , CT +# Alpha formats A8_UNORM , A8 , R8 , NNNN , 000R , CTBSA A8_SNORM , RN8 , R8 , SSSS , 000R , T A8_SINT , RS8 , R8 , IIII , 000R , T @@ -114,6 +191,7 @@ A32_FLOAT , AF32 , R32 , FFFF , 000 A32_SINT , RS32 , R32 , IIII , 000R , T A32_UINT , RU32 , R32 , UUUU , 000R , T +# Luminance/alpha formats L4A4_UNORM , NONE , G4R4 , NNNN , RRRG , T L8A8_UNORM , G8R8 , G8R8 , NNNN , RRRG , T L8A8_SNORM , GN8RN8 , G8R8 , SSSS , RRRG , T @@ -129,6 +207,25 @@ L32A32_FLOAT , RF32_GF32 , R32_G32 , FFFF , RRR L32A32_SINT , RS32_GS32 , R32_G32 , IIII , RRRG , T L32A32_UINT , RU32_GU32 , R32_G32 , UUUU , RRRG , T +# Red/alpha formats +R4A4_UNORM , NONE , G4R4 , NNNN , R00G , T +R8A8_UNORM , NONE , G8R8 , NNNN , R00G , T +A4R4_UNORM , NONE , G4R4 , NNNN , G00R , T +A8R8_UNORM , NONE , G8R8 , NNNN , G00R , T + +# YCbCr formats +R8G8_B8G8_UNORM , NONE , G8B8G8R8 , NNNN , RGB1 , T +G8R8_B8R8_UNORM , NONE , G8B8G8R8 , NNNN , GRB1 , T +G8R8_G8B8_UNORM , NONE , B8G8R8G8 , NNNN , RGB1 , T +R8G8_R8B8_UNORM , NONE , B8G8R8G8 , NNNN , GRB1 , T +G8B8_G8R8_UNORM , NONE , B8G8R8G8 , NNNN , BGR1 , T +B8G8_R8G8_UNORM , NONE , G8B8G8R8 , NNNN , BGR1 , T + +# Weird D3D9 formats +R8SG8SB8UX8U_NORM , NONE , A8B8G8R8 , SSNN , RGB1 , T +R5SG5SB6U_NORM , NONE , B6G5R5 , SSNN , RGB1 , T + +# DXT compressed formats DXT1_RGB , NONE , DXT1 , NNNN , RGB1 , T DXT1_SRGB , NONE , DXT1 , NNNN , RGB1 , T DXT1_RGBA , NONE , DXT1 , NNNN , RGBA , T @@ -164,6 +261,7 @@ ETC2_R11_SNORM , NONE , EAC , SSSS , R00 ETC2_RG11_UNORM , NONE , EACX2 , NNNN , RG01 , T , Maxwell ETC2_RG11_SNORM , NONE , EACX2 , SSSS , RG01 , T , Maxwell +# ASTC compressed formats ASTC_4x4 , NONE , ASTC_2D_4X4 , NNNN , RGBA , T , TK1 ASTC_5x4 , NONE , ASTC_2D_5X4 , NNNN , RGBA , T , TK1 ASTC_5x5 , NONE , ASTC_2D_5X5 , NNNN , RGBA , T , TK1 @@ -193,92 +291,3 @@ ASTC_10x8_SRGB , NONE , ASTC_2D_10X8 , NNNN , RGB ASTC_10x10_SRGB , NONE , ASTC_2D_10X10 , NNNN , RGBA , T , TK1 ASTC_12x10_SRGB , NONE , ASTC_2D_12X10 , NNNN , RGBA , T , TK1 ASTC_12x12_SRGB , NONE , ASTC_2D_12X12 , NNNN , RGBA , T , TK1 - -R32G32B32A32_FLOAT , RF32_GF32_BF32_AF32 , R32_G32_B32_A32 , FFFF , RGBA , CTBSA -R32G32B32A32_UNORM , NONE , R32_G32_B32_A32 , NNNN , RGBA , T -R32G32B32A32_SNORM , NONE , R32_G32_B32_A32 , SSSS , RGBA , T -R32G32B32A32_SINT , RS32_GS32_BS32_AS32 , R32_G32_B32_A32 , IIII , RGBA , CTBS -R32G32B32A32_UINT , RU32_GU32_BU32_AU32 , R32_G32_B32_A32 , UUUU , RGBA , CTBS -R32G32B32X32_FLOAT , RF32_GF32_BF32_X32 , R32_G32_B32_A32 , FFFF , RGB1 , CTA -R32G32B32X32_SINT , RS32_GS32_BS32_X32 , R32_G32_B32_A32 , IIII , RGB1 , CT -R32G32B32X32_UINT , RU32_GU32_BU32_X32 , R32_G32_B32_A32 , UUUU , RGB1 , CT - -R32G32B32_FLOAT , NONE , R32_G32_B32 , FFFF , RGB1 , TB -R32G32B32_SINT , NONE , R32_G32_B32 , IIII , RGB1 , TB -R32G32B32_UINT , NONE , R32_G32_B32 , UUUU , RGB1 , TB - -R32G32_FLOAT , RF32_GF32 , R32_G32 , FFFF , RG01 , CTBSA -R32G32_UNORM , NONE , R32_G32 , NNNN , RG01 , T -R32G32_SNORM , NONE , R32_G32 , SSSS , RG01 , T -R32G32_SINT , RS32_GS32 , R32_G32 , IIII , RG01 , CTBS -R32G32_UINT , RU32_GU32 , R32_G32 , UUUU , RG01 , CTBS - -R32_FLOAT , RF32 , R32 , FFFF , R001 , CTBSA -R32_UNORM , NONE , R32 , NNNN , R001 , T -R32_SNORM , NONE , R32 , SSSS , R001 , T -R32_SINT , RS32 , R32 , IIII , R001 , CTBS -R32_UINT , RU32 , R32 , UUUU , R001 , CTBS - -R64_SINT , NONE , R32_G32 , IIII , RG01 , S -R64_UINT , NONE , R32_G32 , UUUU , RG01 , S - -R16G16B16A16_FLOAT , RF16_GF16_BF16_AF16 , R16_G16_B16_A16 , FFFF , RGBA , CTBSA -R16G16B16A16_UNORM , R16_G16_B16_A16 , R16_G16_B16_A16 , NNNN , RGBA , CTBSA -R16G16B16A16_SNORM , RN16_GN16_BN16_AN16 , R16_G16_B16_A16 , SSSS , RGBA , CTBSA -R16G16B16A16_SINT , RS16_GS16_BS16_AS16 , R16_G16_B16_A16 , IIII , RGBA , CTBS -R16G16B16A16_UINT , RU16_GU16_BU16_AU16 , R16_G16_B16_A16 , UUUU , RGBA , CTBS -R16G16B16X16_FLOAT , RF16_GF16_BF16_X16 , R16_G16_B16_A16 , FFFF , RGB1 , CTA -R16G16B16X16_UNORM , R16_G16_B16_A16 , R16_G16_B16_A16 , NNNN , RGB1 , T -R16G16B16X16_SNORM , RN16_GN16_BN16_AN16 , R16_G16_B16_A16 , SSSS , RGB1 , T -R16G16B16X16_SINT , RS16_GS16_BS16_AS16 , R16_G16_B16_A16 , IIII , RGB1 , CT -R16G16B16X16_UINT , RU16_GU16_BU16_AU16 , R16_G16_B16_A16 , UUUU , RGB1 , CT - -R16G16_FLOAT , RF16_GF16 , R16_G16 , FFFF , RG01 , CTBSA -R16G16_UNORM , R16_G16 , R16_G16 , NNNN , RG01 , CTBSA -R16G16_SNORM , RN16_GN16 , R16_G16 , SSSS , RG01 , CTBSA -R16G16_SINT , RS16_GS16 , R16_G16 , IIII , RG01 , CTBS -R16G16_UINT , RU16_GU16 , R16_G16 , UUUU , RG01 , CTBS - -R16_FLOAT , RF16 , R16 , FFFF , R001 , CTBSA -R16_UNORM , R16 , R16 , NNNN , R001 , CTBSA -R16_SNORM , RN16 , R16 , SSSS , R001 , CTBSA -R16_SINT , RS16 , R16 , IIII , R001 , CTBS -R16_UINT , RU16 , R16 , UUUU , R001 , CTBS - -R8G8B8A8_SNORM , AN8BN8GN8RN8 , A8B8G8R8 , SSSS , RGBA , CTBSA -R8G8B8A8_SINT , AS8BS8GS8RS8 , A8B8G8R8 , IIII , RGBA , CTBS -R8G8B8A8_UINT , AU8BU8GU8RU8 , A8B8G8R8 , UUUU , RGBA , CTBS -R8G8B8X8_SNORM , AN8BN8GN8RN8 , A8B8G8R8 , SSSS , RGB1 , T -R8G8B8X8_SINT , AS8BS8GS8RS8 , A8B8G8R8 , IIII , RGB1 , CT -R8G8B8X8_UINT , AU8BU8GU8RU8 , A8B8G8R8 , UUUU , RGB1 , CT - -R8G8_UNORM , G8R8 , G8R8 , NNNN , RG01 , CTBSA -R8G8_SNORM , GN8RN8 , G8R8 , SSSS , RG01 , CTBSA -R8G8_SINT , GS8RS8 , G8R8 , IIII , RG01 , CTBS -R8G8_UINT , GU8RU8 , G8R8 , UUUU , RG01 , CTBS - -# On Fermi+, the green component doesn't get decoding? -# R8G8_SRGB , NONE , G8R8 , NNNN , RG01 , T - -R8_UNORM , R8 , R8 , NNNN , R001 , CTBSA -R8_SNORM , RN8 , R8 , SSSS , R001 , CTBSA -R8_SINT , RS8 , R8 , IIII , R001 , CTBS -R8_UINT , RU8 , R8 , UUUU , R001 , CTBS -R8_SRGB , NONE , R8 , NNNN , R001 , T - -R8G8_B8G8_UNORM , NONE , G8B8G8R8 , NNNN , RGB1 , T -G8R8_B8R8_UNORM , NONE , G8B8G8R8 , NNNN , GRB1 , T -G8R8_G8B8_UNORM , NONE , B8G8R8G8 , NNNN , RGB1 , T -R8G8_R8B8_UNORM , NONE , B8G8R8G8 , NNNN , GRB1 , T -G8B8_G8R8_UNORM , NONE , B8G8R8G8 , NNNN , BGR1 , T -B8G8_R8G8_UNORM , NONE , G8B8G8R8 , NNNN , BGR1 , T - -R1_UNORM , NONE , R1 , NNNN , R001 , T - -R4A4_UNORM , NONE , G4R4 , NNNN , R00G , T -R8A8_UNORM , NONE , G8R8 , NNNN , R00G , T -A4R4_UNORM , NONE , G4R4 , NNNN , G00R , T -A8R8_UNORM , NONE , G8R8 , NNNN , G00R , T - -R8SG8SB8UX8U_NORM , NONE , A8B8G8R8 , SSNN , RGB1 , T -R5SG5SB6U_NORM , NONE , B6G5R5 , SSNN , RGB1 , T