Mesa (master): gallium: Add PIPE_FORMAT_AnLn and PIPE_FORMAT_GnRn formats

[Dave Airlie]

Module: Mesa
Branch: master
Commit: f14b40ab320db149b3ea1c293ef4e14ce8a29fc5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f14b40ab320db149b3ea1c293ef4e14ce8a29fc5

Author: Richard Sandiford <rsandifo at linux.vnet.ibm.com>
Date:   Tue Jul 22 10:51:15 2014 +0100

gallium: Add PIPE_FORMAT_AnLn and PIPE_FORMAT_GnRn formats

...i.e. formats in which the alpha or green channel is first in memory.

This means that each LnAn and RnGn format has a reversed counterpart,
which is necessary for handling big-endian mesa<->gallium mappings.

Signed-off-by: Richard Sandiford <rsandifo at linux.vnet.ibm.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/gallium/auxiliary/util/u_format.csv |    9 +++++++++
 src/gallium/include/pipe/p_format.h     |   10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/gallium/auxiliary/util/u_format.csv b/src/gallium/auxiliary/util/u_format.csv
index affc363..8329cdf 100644
--- a/src/gallium/auxiliary/util/u_format.csv
+++ b/src/gallium/auxiliary/util/u_format.csv
@@ -384,3 +384,12 @@ PIPE_FORMAT_R10G10B10A2_UINT        , plain, 1, 1, up10 , up10 , up10, up2 , xyz
 
 PIPE_FORMAT_B5G6R5_SRGB             , plain, 1, 1, un5 , un6 , un5 ,     , zyx1, srgb, un5 , un6 , un5 ,     , xyz1
 
+PIPE_FORMAT_A8L8_UNORM            , plain, 1, 1, un8 , un8 , , , yyyx, rgb
+PIPE_FORMAT_A8L8_SNORM            , plain, 1, 1, sn8 , sn8 , , , yyyx, rgb
+PIPE_FORMAT_A8L8_SRGB             , plain, 1, 1, un8 , un8 , , , yyyx, srgb
+PIPE_FORMAT_A16L16_UNORM          , plain, 1, 1, un16, un16, , , yyyx, rgb
+
+PIPE_FORMAT_G8R8_UNORM            , plain, 1, 1, un8 , un8 , , , yx01, rgb
+PIPE_FORMAT_G8R8_SNORM            , plain, 1, 1, sn8 , sn8 , , , yx01, rgb
+PIPE_FORMAT_G16R16_UNORM          , plain, 1, 1, un16, un16, , , yx01, rgb
+PIPE_FORMAT_G16R16_SNORM          , plain, 1, 1, sn16, sn16, , , yx01, rgb
diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h
index 1b04884..d744205 100644
--- a/src/gallium/include/pipe/p_format.h
+++ b/src/gallium/include/pipe/p_format.h
@@ -349,6 +349,16 @@ enum pipe_format {
    PIPE_FORMAT_BPTC_RGB_FLOAT          = 257,
    PIPE_FORMAT_BPTC_RGB_UFLOAT         = 258,
 
+   PIPE_FORMAT_A8L8_UNORM              = 259,
+   PIPE_FORMAT_A8L8_SNORM              = 260,
+   PIPE_FORMAT_A8L8_SRGB               = 261,
+   PIPE_FORMAT_A16L16_UNORM            = 262,
+
+   PIPE_FORMAT_G8R8_UNORM              = 263,
+   PIPE_FORMAT_G8R8_SNORM              = 264,
+   PIPE_FORMAT_G16R16_UNORM            = 265,
+   PIPE_FORMAT_G16R16_SNORM            = 266,
+
    PIPE_FORMAT_COUNT
 };