mesa: Replace MESA_FORMAT_L8A8/A8L8 UNORM/SNORM/SRGB with an array format.

[mesa.git] / src / mesa / main / formats.csv

diff --git a/src/mesa/main/formats.csv b/src/mesa/main/formats.csv
index f123ab2ba73268b5fac375c0a866c37994aff328..764134d25f5e27863993688df325889b8ba9733a 100644 (file)
--- a/src/mesa/main/formats.csv
+++ b/src/mesa/main/formats.csv
@@ -70,8 +70,6 @@ MESA_FORMAT_X1B5G5R5_UNORM                , packed, 1, 1, 1, x1  , un5 , un5 , u
 MESA_FORMAT_B5G5R5A1_UNORM                , packed, 1, 1, 1, un5 , un5 , un5 , un1 , zyxw, rgb
 MESA_FORMAT_B5G5R5X1_UNORM                , packed, 1, 1, 1, un5 , un5 , un5 , x1  , zyx1, rgb
 MESA_FORMAT_A1R5G5B5_UNORM                , packed, 1, 1, 1, un1 , un5 , un5 , un5 , yzwx, rgb
-MESA_FORMAT_L8A8_UNORM                    , packed, 1, 1, 1, un8 , un8 ,     ,     , xxxy, rgb
-MESA_FORMAT_A8L8_UNORM                    , packed, 1, 1, 1, un8 , un8 ,     ,     , yyyx, rgb
 MESA_FORMAT_R8G8_UNORM                    , packed, 1, 1, 1, un8 , un8 ,     ,     , xy01, rgb
 MESA_FORMAT_G8R8_UNORM                    , packed, 1, 1, 1, un8 , un8 ,     ,     , yx01, rgb
 MESA_FORMAT_L4A4_UNORM                    , packed, 1, 1, 1, un4 , un4 ,     ,     , xxxy, rgb
@@ -104,6 +102,7 @@ MESA_FORMAT_A_UNORM8                      , array , 1, 1, 1, un8 ,     ,     ,
 MESA_FORMAT_A_UNORM16                     , array , 1, 1, 1, un16,     ,     ,     , 000x, rgb
 MESA_FORMAT_L_UNORM8                      , array , 1, 1, 1, un8 ,     ,     ,     , xxx1, rgb
 MESA_FORMAT_L_UNORM16                     , array , 1, 1, 1, un16,     ,     ,     , xxx1, rgb
+MESA_FORMAT_LA_UNORM8                     , array , 1, 1, 1, un8 , un8 ,     ,     , xxxy, rgb
 MESA_FORMAT_LA_UNORM16                    , array , 1, 1, 1, un16, un16,     ,     , xxxy, rgb
 MESA_FORMAT_I_UNORM8                      , array , 1, 1, 1, un8 ,     ,     ,     , xxxx, rgb
 MESA_FORMAT_I_UNORM16                     , array , 1, 1, 1, un16,     ,     ,     , xxxx, rgb
@@ -127,8 +126,6 @@ MESA_FORMAT_R16G16_SNORM                  , packed, 1, 1, 1, sn16, sn16,     ,
 MESA_FORMAT_G16R16_SNORM                  , packed, 1, 1, 1, sn16, sn16,     ,     , yx01, rgb
 MESA_FORMAT_R8G8_SNORM                    , packed, 1, 1, 1, sn8 , sn8 ,     ,     , xy01, rgb
 MESA_FORMAT_G8R8_SNORM                    , packed, 1, 1, 1, sn8 , sn8 ,     ,     , yx01, rgb
-MESA_FORMAT_L8A8_SNORM                    , packed, 1, 1, 1, sn8 , sn8 ,     ,     , xxxy, rgb
-MESA_FORMAT_A8L8_SNORM                    , packed, 1, 1, 1, sn8 , sn8 ,     ,     , yyyx, rgb
 
 # Array signed/normalized formats
 MESA_FORMAT_A_SNORM8                      , array , 1, 1, 1, sn8 ,     ,     ,     , 000x, rgb
@@ -139,6 +136,7 @@ MESA_FORMAT_I_SNORM8                      , array , 1, 1, 1, sn8 ,     ,     ,
 MESA_FORMAT_I_SNORM16                     , array , 1, 1, 1, sn16,     ,     ,     , xxxx, rgb
 MESA_FORMAT_R_SNORM8                      , array , 1, 1, 1, sn8 ,     ,     ,     , x001, rgb
 MESA_FORMAT_R_SNORM16                     , array , 1, 1, 1, sn16,     ,     ,     , x001, rgb
+MESA_FORMAT_LA_SNORM8                     , array , 1, 1, 1, sn8 , sn8 ,     ,     , xxxy, rgb
 MESA_FORMAT_LA_SNORM16                    , array , 1, 1, 1, sn16, sn16,     ,     , xxxy, rgb
 MESA_FORMAT_RGB_SNORM16                   , array , 1, 1, 1, sn16, sn16, sn16,     , xyz1, rgb
 MESA_FORMAT_RGBA_SNORM16                  , array , 1, 1, 1, sn16, sn16, sn16, sn16, xyzw, rgb
@@ -153,12 +151,11 @@ MESA_FORMAT_X8R8G8B8_SRGB                 , packed, 1, 1, 1, x8  , un8 , un8 , u
 MESA_FORMAT_R8G8B8A8_SRGB                 , packed, 1, 1, 1, un8 , un8 , un8 , un8 , xyzw, srgb
 MESA_FORMAT_R8G8B8X8_SRGB                 , packed, 1, 1, 1, un8 , un8 , un8 , x8  , xyz1, srgb
 MESA_FORMAT_X8B8G8R8_SRGB                 , packed, 1, 1, 1, x8  , un8 , un8 , un8 , wzy1, srgb
-MESA_FORMAT_L8A8_SRGB                     , packed, 1, 1, 1, un8 , un8 ,     ,     , xxxy, srgb
-MESA_FORMAT_A8L8_SRGB                     , packed, 1, 1, 1, un8 , un8 ,     ,     , yyyx, srgb
 
 # Array sRGB formats
 MESA_FORMAT_R_SRGB8                       , array , 1, 1, 1, un8 ,     ,     ,     , x001, srgb
 MESA_FORMAT_L_SRGB8                       , array , 1, 1, 1, un8 ,     ,     ,     , xxx1, srgb
+MESA_FORMAT_LA_SRGB8                      , array , 1, 1, 1, un8 , un8 ,     ,     , xxxy, srgb
 MESA_FORMAT_BGR_SRGB8                     , array , 1, 1, 1, un8 , un8 , un8 ,     , zyx1, srgb
 
 # Packed float formats