mesa: Redefine the RG formats as array formats.

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

diff --git a/src/mesa/main/formats.csv b/src/mesa/main/formats.csv
index 764134d25f5e27863993688df325889b8ba9733a..bd0975a9192194a6d951785d5db85338d5f71d06 100644 (file)
--- a/src/mesa/main/formats.csv
+++ b/src/mesa/main/formats.csv
@@ -70,13 +70,9 @@ 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_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
 
 MESA_FORMAT_B2G3R3_UNORM                  , packed, 1, 1, 1, un2 , un3 , un3 ,     , zyx1, rgb
-MESA_FORMAT_R16G16_UNORM                  , packed, 1, 1, 1, un16, un16,     ,     , xy01, rgb
-MESA_FORMAT_G16R16_UNORM                  , packed, 1, 1, 1, un16, un16,     ,     , yx01, rgb
 MESA_FORMAT_B10G10R10A2_UNORM             , packed, 1, 1, 1, un10, un10, un10, un2 , zyxw, rgb
 MESA_FORMAT_B10G10R10X2_UNORM             , packed, 1, 1, 1, un10, un10, un10, x2  , zyx1, rgb
 MESA_FORMAT_R10G10B10A2_UNORM             , packed, 1, 1, 1, un10, un10, un10, un2 , xyzw, rgb
@@ -108,6 +104,8 @@ MESA_FORMAT_I_UNORM8                      , array , 1, 1, 1, un8 ,     ,     ,
 MESA_FORMAT_I_UNORM16                     , array , 1, 1, 1, un16,     ,     ,     , xxxx, rgb
 MESA_FORMAT_R_UNORM8                      , array , 1, 1, 1, un8 ,     ,     ,     , x001, rgb
 MESA_FORMAT_R_UNORM16                     , array , 1, 1, 1, un16,     ,     ,     , x001, rgb
+MESA_FORMAT_RG_UNORM8                     , array , 1, 1, 1, un8 , un8 ,     ,     , xy01, rgb
+MESA_FORMAT_RG_UNORM16                    , array , 1, 1, 1, un16, un16,     ,     , xy01, rgb
 MESA_FORMAT_BGR_UNORM8                    , array , 1, 1, 1, un8 , un8 , un8 ,     , zyx1, rgb
 MESA_FORMAT_RGB_UNORM8                    , array , 1, 1, 1, un8 , un8 , un8 ,     , xyz1, rgb
 MESA_FORMAT_RGBA_UNORM16                  , array , 1, 1, 1, un16, un16, un16, un16, xyzw, rgb
@@ -122,10 +120,6 @@ MESA_FORMAT_A8B8G8R8_SNORM                , packed, 1, 1, 1, sn8 , sn8 , sn8 , s
 MESA_FORMAT_X8B8G8R8_SNORM                , packed, 1, 1, 1, x8  , sn8 , sn8 , sn8 , wzy1, rgb
 MESA_FORMAT_R8G8B8A8_SNORM                , packed, 1, 1, 1, sn8 , sn8 , sn8 , sn8 , xyzw, rgb
 MESA_FORMAT_R8G8B8X8_SNORM                , packed, 1, 1, 1, sn8 , sn8 , sn8 , x8  , xyz1, rgb
-MESA_FORMAT_R16G16_SNORM                  , packed, 1, 1, 1, sn16, sn16,     ,     , xy01, rgb
-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
 
 # Array signed/normalized formats
 MESA_FORMAT_A_SNORM8                      , array , 1, 1, 1, sn8 ,     ,     ,     , 000x, rgb
@@ -138,6 +132,8 @@ MESA_FORMAT_R_SNORM8                      , array , 1, 1, 1, sn8 ,     ,     ,
 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_RG_SNORM8                     , array , 1, 1, 1, sn8 , sn8 ,     ,     , xy01, rgb
+MESA_FORMAT_RG_SNORM16                    , array , 1, 1, 1, sn16, sn16,     ,     , xy01, 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
 MESA_FORMAT_RGBX_SNORM16                  , array , 1, 1, 1, sn16, sn16, sn16, x16 , xyz1, rgb