From 58b5f6b678577dcc73cc96c059fa82c2e7ea32e7 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Fri, 19 Apr 2024 10:27:47 -0500 Subject: [PATCH] nil: Be more speicific about Maxwell in the format table Part-of: --- src/nouveau/nil/nil_format_table_gen.py | 6 +++--- src/nouveau/nil/nil_formats.csv | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/nouveau/nil/nil_format_table_gen.py b/src/nouveau/nil/nil_format_table_gen.py index d42269ad416..ebd404e9c8a 100644 --- a/src/nouveau/nil/nil_format_table_gen.py +++ b/src/nouveau/nil/nil_format_table_gen.py @@ -89,19 +89,19 @@ const struct nil_format_info nil_format_table[PIPE_FORMAT_COUNT] = { CT_FORMAT_PREFIX = { None : 'NV9097_SET_COLOR_TARGET_FORMAT_V_', - 'maxwell' : 'NVB097_SET_COLOR_TARGET_FORMAT_V_', + 'maxwella' : 'NVB097_SET_COLOR_TARGET_FORMAT_V_', 'tk1' : 'NVB097_SET_COLOR_TARGET_FORMAT_V_', } ZT_FORMAT_PREFIX = { None : 'NV9097_SET_ZT_FORMAT_V_', - 'maxwell' : 'NVB097_SET_ZT_FORMAT_V_', + 'maxwella' : 'NVB097_SET_ZT_FORMAT_V_', 'tk1' : 'NVB097_SET_ZT_FORMAT_V_', } TCS_PREFIX = { None : 'NV9097_TEXHEADV2_0_COMPONENT_SIZES_', - 'maxwell' : 'NVB097_TEXHEAD_BL_COMPONENTS_SIZES_', + 'maxwella' : 'NVB097_TEXHEAD_BL_COMPONENTS_SIZES_', 'tk1' : 'NVB097_TEXHEAD_BL_COMPONENTS_SIZES_', } diff --git a/src/nouveau/nil/nil_formats.csv b/src/nouveau/nil/nil_formats.csv index 36e1ea1cb3c..e55b7c1caf5 100644 --- a/src/nouveau/nil/nil_formats.csv +++ b/src/nouveau/nil/nil_formats.csv @@ -138,7 +138,7 @@ R64_SINT , NONE , R32_G32 , II , RG0 R64_UINT , NONE , R32_G32 , UU , RG01 , S # Depth/stencil formats -Z16_UNORM , Z16 , Z16 , N , R001 , TZ , Maxwell +Z16_UNORM , Z16 , Z16 , N , R001 , TZ , MaxwellA Z32_FLOAT , ZF32 , ZF32 , F , R001 , TZ Z24X8_UNORM , X8Z24 , X8Z24 , NU , R001 , TZ X8Z24_UNORM , Z24S8 , Z24S8 , UN , G001 , TZ @@ -253,17 +253,17 @@ BPTC_SRGBA , NONE , BC7U , NNNN , RGB BPTC_RGB_FLOAT , NONE , BC6H_SF16 , FFFF , RGB1 , T BPTC_RGB_UFLOAT , NONE , BC6H_UF16 , FFFF , RGB1 , T -ETC1_RGB8 , NONE , ETC2_RGB , NNNN , RGB1 , T , Maxwell -ETC2_RGB8 , NONE , ETC2_RGB , NNNN , RGB1 , T , Maxwell -ETC2_SRGB8 , NONE , ETC2_RGB , NNNN , RGB1 , T , Maxwell -ETC2_RGB8A1 , NONE , ETC2_RGB_PTA , NNNN , RGBA , T , Maxwell -ETC2_SRGB8A1 , NONE , ETC2_RGB_PTA , NNNN , RGBA , T , Maxwell -ETC2_RGBA8 , NONE , ETC2_RGBA , NNNN , RGBA , T , Maxwell -ETC2_SRGBA8 , NONE , ETC2_RGBA , NNNN , RGBA , T , Maxwell -ETC2_R11_UNORM , NONE , EAC , NNNN , R001 , T , Maxwell -ETC2_R11_SNORM , NONE , EAC , SSSS , R001 , T , Maxwell -ETC2_RG11_UNORM , NONE , EACX2 , NNNN , RG01 , T , Maxwell -ETC2_RG11_SNORM , NONE , EACX2 , SSSS , RG01 , T , Maxwell +ETC1_RGB8 , NONE , ETC2_RGB , NNNN , RGB1 , T , MaxwellA +ETC2_RGB8 , NONE , ETC2_RGB , NNNN , RGB1 , T , MaxwellA +ETC2_SRGB8 , NONE , ETC2_RGB , NNNN , RGB1 , T , MaxwellA +ETC2_RGB8A1 , NONE , ETC2_RGB_PTA , NNNN , RGBA , T , MaxwellA +ETC2_SRGB8A1 , NONE , ETC2_RGB_PTA , NNNN , RGBA , T , MaxwellA +ETC2_RGBA8 , NONE , ETC2_RGBA , NNNN , RGBA , T , MaxwellA +ETC2_SRGBA8 , NONE , ETC2_RGBA , NNNN , RGBA , T , MaxwellA +ETC2_R11_UNORM , NONE , EAC , NNNN , R001 , T , MaxwellA +ETC2_R11_SNORM , NONE , EAC , SSSS , R001 , T , MaxwellA +ETC2_RG11_UNORM , NONE , EACX2 , NNNN , RG01 , T , MaxwellA +ETC2_RG11_SNORM , NONE , EACX2 , SSSS , RG01 , T , MaxwellA # ASTC compressed formats ASTC_4x4 , NONE , ASTC_2D_4X4 , NNNN , RGBA , T , TK1