diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-07 10:45:44 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-07 10:45:44 +0100 |
| commit | cbcf519f983c24f5d315b4abc194e5d147dc0ab7 (patch) | |
| tree | 3f9cafad0ae5ba278eb444c4ec85f53155e7050d /mesalib/src/mesa/main/formats.h | |
| parent | 012567f7279756f1fcc4aee30e5e72f0938fe3da (diff) | |
| parent | 956c20498738c242726b5a42ed28db8572a90bed (diff) | |
| download | vcxsrv-cbcf519f983c24f5d315b4abc194e5d147dc0ab7.tar.gz vcxsrv-cbcf519f983c24f5d315b4abc194e5d147dc0ab7.tar.bz2 vcxsrv-cbcf519f983c24f5d315b4abc194e5d147dc0ab7.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa fontconfig git update 7 Feb 2013
Diffstat (limited to 'mesalib/src/mesa/main/formats.h')
| -rw-r--r-- | mesalib/src/mesa/main/formats.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/formats.h b/mesalib/src/mesa/main/formats.h index 050fce96c..2961ffa9f 100644 --- a/mesalib/src/mesa/main/formats.h +++ b/mesalib/src/mesa/main/formats.h @@ -102,8 +102,8 @@ typedef enum MESA_FORMAT_GR88, /* GGGG GGGG RRRR RRRR */ MESA_FORMAT_RG88, /* RRRR RRRR GGGG GGGG */ MESA_FORMAT_R16, /* RRRR RRRR RRRR RRRR */ - MESA_FORMAT_RG1616, /* GGGG GGGG GGGG GGGG RRRR RRRR RRRR RRRR */ - MESA_FORMAT_RG1616_REV, /* RRRR RRRR RRRR RRRR GGGG GGGG GGGG GGGG */ + MESA_FORMAT_GR1616, /* GGGG GGGG GGGG GGGG RRRR RRRR RRRR RRRR */ + MESA_FORMAT_RG1616, /* RRRR RRRR RRRR RRRR GGGG GGGG GGGG GGGG */ MESA_FORMAT_ARGB2101010, /* AARR RRRR RRRR GGGG GGGG GGBB BBBB BBBB */ MESA_FORMAT_Z24_S8, /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ SSSS SSSS */ MESA_FORMAT_S8_Z24, /* SSSS SSSS ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */ @@ -288,6 +288,22 @@ typedef enum MESA_FORMAT_ARGB2101010_UINT, MESA_FORMAT_ABGR2101010_UINT, + MESA_FORMAT_XRGB4444_UNORM, + MESA_FORMAT_XRGB1555_UNORM, + MESA_FORMAT_XBGR8888_SNORM, + MESA_FORMAT_XBGR8888_SRGB, + MESA_FORMAT_XBGR8888_UINT, + MESA_FORMAT_XBGR8888_SINT, + MESA_FORMAT_XRGB2101010_UNORM, + MESA_FORMAT_XBGR16161616_UNORM, + MESA_FORMAT_XBGR16161616_SNORM, + MESA_FORMAT_XBGR16161616_FLOAT, + MESA_FORMAT_XBGR16161616_UINT, + MESA_FORMAT_XBGR16161616_SINT, + MESA_FORMAT_XBGR32323232_FLOAT, + MESA_FORMAT_XBGR32323232_UINT, + MESA_FORMAT_XBGR32323232_SINT, + MESA_FORMAT_COUNT } gl_format; |