diff options
| author | marha <marha@users.sourceforge.net> | 2014-06-26 09:35:54 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-06-26 09:35:54 +0200 |
| commit | d47db8d4713de42ccca071c9e8401fc7a213ed49 (patch) | |
| tree | 7189b3c025315c514ae9d2835810b94d0e4e0e01 /mesalib/src/mapi | |
| parent | 880395e8c3f451bf34b96da76fcee133b356e966 (diff) | |
| parent | c30d5eefc96925b4bef781806c7a0114eca1b8e0 (diff) | |
| download | vcxsrv-d47db8d4713de42ccca071c9e8401fc7a213ed49.tar.gz vcxsrv-d47db8d4713de42ccca071c9e8401fc7a213ed49.tar.bz2 vcxsrv-d47db8d4713de42ccca071c9e8401fc7a213ed49.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Opdated to openssl-1.0.1h xkeyboard-config fontconfig libX11 libxcb xcb-proto mesa xserver git update 26 June 2014
Conflicts:
openssl/Makefile
Diffstat (limited to 'mesalib/src/mapi')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/ARB_compressed_texture_pixel_storage.xml | 21 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/Makefile.am | 1 | ||||
| -rwxr-xr-x | mesalib/src/mapi/glapi/gen/gl_API.xml | 18 |
3 files changed, 38 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_compressed_texture_pixel_storage.xml b/mesalib/src/mapi/glapi/gen/ARB_compressed_texture_pixel_storage.xml new file mode 100644 index 000000000..c9d0f11be --- /dev/null +++ b/mesalib/src/mapi/glapi/gen/ARB_compressed_texture_pixel_storage.xml @@ -0,0 +1,21 @@ +<?xml version="1.0"?> +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> + +<OpenGLAPI> + +<category name="GL_ARB_compressed_texture_pixel_storage" number="110"> + + <enum name="UNPACK_COMPRESSED_BLOCK_WIDTH" value="0x9127"/> + <enum name="UNPACK_COMPRESSED_BLOCK_HEIGHT" value="0x9128"/> + <enum name="UNPACK_COMPRESSED_BLOCK_DEPTH" value="0x9129"/> + <enum name="UNPACK_COMPRESSED_BLOCK_SIZE" value="0x912A"/> + + <enum name="PACK_COMPRESSED_BLOCK_WIDTH" value="0x912B"/> + <enum name="PACK_COMPRESSED_BLOCK_HEIGHT" value="0x912C"/> + <enum name="PACK_COMPRESSED_BLOCK_DEPTH" value="0x912D"/> + <enum name="PACK_COMPRESSED_BLOCK_SIZE" value="0x912E"/> + +</category> + +</OpenGLAPI> + diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am index 6f36989bc..be7d9e0ef 100644 --- a/mesalib/src/mapi/glapi/gen/Makefile.am +++ b/mesalib/src/mapi/glapi/gen/Makefile.am @@ -113,6 +113,7 @@ API_XML = \ ARB_blend_func_extended.xml \ ARB_clear_buffer_object.xml \ ARB_color_buffer_float.xml \ + ARB_compressed_texture_pixel_storage.xml \ ARB_compute_shader.xml \ ARB_copy_buffer.xml \ ARB_debug_output.xml \ diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index 58aed8e6f..a43410322 100755 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml @@ -8276,7 +8276,9 @@ </function> </category> -<!-- ARB extensions #110...#116 --> +<xi:include href="ARB_compressed_texture_pixel_storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + +<!-- ARB extensions #111...#116 --> <xi:include href="ARB_internalformat_query.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> @@ -8310,7 +8312,19 @@ <xi:include href="ARB_ES3_compatibility.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<!-- ARB extensions #128...#131 --> +<!-- ARB extension #128 --> + +<category name="GL_ARB_fragment_layer_viewport" number="129"> + <!-- No new functions, types, enums. --> +</category> + +<!-- ARB extensions #130..#131 --> + +<category name="GL_ARB_explicit_uniform_location" number="128"> + <enum name="MAX_UNIFORM_LOCATIONS" count="1" value="0x826E" > + <size name="Get" mode="get"/> + </enum> +</category> <xi:include href="ARB_invalidate_subdata.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> |