aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/formats.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-02-07 10:17:56 +0100
committermarha <marha@users.sourceforge.net>2013-02-07 10:17:56 +0100
commit956c20498738c242726b5a42ed28db8572a90bed (patch)
treebf663b89417d0d9d7b37575eb0260d5a10af0e12 /mesalib/src/mesa/main/formats.h
parent76c527be60066b647468ad66f8e4d7dd18fa1769 (diff)
downloadvcxsrv-956c20498738c242726b5a42ed28db8572a90bed.tar.gz
vcxsrv-956c20498738c242726b5a42ed28db8572a90bed.tar.bz2
vcxsrv-956c20498738c242726b5a42ed28db8572a90bed.zip
mesa fontconfig git update 7 Feb 2013
fontconfig commit 96220a5ed9d1d761b14a7ac516ac6786c132f280 mesa commit 9ba1e23647c09290c98cc7133fb73dd1df1da8ab
Diffstat (limited to 'mesalib/src/mesa/main/formats.h')
-rw-r--r--mesalib/src/mesa/main/formats.h20
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;