From c30d5eefc96925b4bef781806c7a0114eca1b8e0 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 26 Jun 2014 09:30:29 +0200
Subject: Opdated to openssl-1.0.1h xkeyboard-config fontconfig libX11 libxcb
 xcb-proto mesa xserver git update 26 June 2014

xserver          commit a3b44ad8db1fa2f3b81c1ff9498f31c5323edd37
libxcb           commit 125135452a554e89e49448e2c1ee6658324e1095
libxcb/xcb-proto commit 84bfd909bc3774a459b11614cfebeaa584a1eb38
xkeyboard-config commit 39a226707b133ab5540c2d30176cb3857e74dcca
libX11           commit a4679baaa18142576d42d423afe816447f08336c
fontconfig       commit 274f2181f294af2eff3e8db106ec8d7bab2d3ff1
mesa             commit 9a8acafa47558cafeb37f80f4b30061ac1962c69
---
 .../gen/ARB_compressed_texture_pixel_storage.xml    | 21 +++++++++++++++++++++
 mesalib/src/mapi/glapi/gen/Makefile.am              |  1 +
 mesalib/src/mapi/glapi/gen/gl_API.xml               | 18 ++++++++++++++++--
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 mesalib/src/mapi/glapi/gen/ARB_compressed_texture_pixel_storage.xml

(limited to 'mesalib/src/mapi')

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 0791bfc57..0a486f070 100644
--- 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"/>
 
-- 
cgit v1.2.3