diff options
author | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
commit | fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf (patch) | |
tree | c59c3e084f79bd1f6060f9a5cedb5c48d4da14ee /mesalib/src/mapi/glapi/gen/es_EXT.xml | |
parent | 5d6e342b3c2d0d3607b184b1472b816228839e3f (diff) | |
parent | 528f5bd58a139174170c4130c67dca30193c9057 (diff) | |
download | vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.gz vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.bz2 vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/es_EXT.xml')
-rw-r--r-- | mesalib/src/mapi/glapi/gen/es_EXT.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesalib/src/mapi/glapi/gen/es_EXT.xml b/mesalib/src/mapi/glapi/gen/es_EXT.xml index bc98aee3d..c7e7d07e3 100644 --- a/mesalib/src/mapi/glapi/gen/es_EXT.xml +++ b/mesalib/src/mapi/glapi/gen/es_EXT.xml @@ -48,6 +48,10 @@ <enum name="BYTE" value="0x1400"/> </category> +<category name="GL_OES_compressed_ETC1_RGB8_texture" number="5"> + <enum name="ETC1_RGB8_OES" value="0x8D64"/> +</category> + <category name="GL_OES_compressed_paletted_texture" number="6"> <enum name="PALETTE4_RGB8_OES" value="0x8B90"/> <enum name="PALETTE4_RGBA8_OES" value="0x8B91"/> |