From 6c0c95d6045d2d2b4e6a3a2f11457850031c57bc Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 22 Aug 2014 21:55:11 +0200
Subject: fontconfig libxcb/xcb-proto mesa xkeyboard-config git update 22 Aug
 2014

libxcb/xcb-proto commit 8e3db42d67a0035bb16d16da28bd5eea7a269178
xkeyboard-config commit 10fce2c2baae471795d069f3a5f1307eedb9ff0a
fontconfig       commit 286cdc9c10b0453c25950103b6a1f7170d15bfdc
mesa             commit 97d03b9366bfa55b27feb92aa5afacd9c5f6f421
---
 mesalib/src/mapi/glapi/gen/ARB_texture_barrier.xml | 13 +++++++++++++
 mesalib/src/mapi/glapi/gen/Makefile.am             |  1 +
 mesalib/src/mapi/glapi/gen/gl_API.xml              | 13 +++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 mesalib/src/mapi/glapi/gen/ARB_texture_barrier.xml

(limited to 'mesalib/src/mapi/glapi/gen')

diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_barrier.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_barrier.xml
new file mode 100644
index 000000000..7119732c8
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_texture_barrier.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+
+<OpenGLAPI>
+
+<category name="GL_ARB_texture_barrier" number="167">
+    <function name="TextureBarrier" alias="TextureBarrierNV" />
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am
index 645def4ef..2fbc59806 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile.am
+++ b/mesalib/src/mapi/glapi/gen/Makefile.am
@@ -145,6 +145,7 @@ API_XML = \
 	ARB_shader_atomic_counters.xml \
 	ARB_shader_image_load_store.xml \
 	ARB_sync.xml \
+	ARB_texture_barrier.xml \
 	ARB_texture_buffer_object.xml \
 	ARB_texture_buffer_range.xml \
 	ARB_texture_compression_rgtc.xml \
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 619717d9e..73f2f7508 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -8364,6 +8364,19 @@
 
 <xi:include href="ARB_multi_bind.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<!-- ARB extensions 148 - 160 -->
+
+<category name="GL_ARB_conditional_render_inverted" number="161">
+    <enum name="QUERY_WAIT_INVERTED"                      value="0x8E17"/>
+    <enum name="QUERY_NO_WAIT_INVERTED"                   value="0x8E18"/>
+    <enum name="QUERY_BY_REGION_WAIT_INVERTED"            value="0x8E19"/>
+    <enum name="QUERY_BY_REGION_NO_WAIT_INVERTED"         value="0x8E1A"/>
+</category>
+
+<!-- ARB extensions 162 - 166 -->
+
+<xi:include href="ARB_texture_barrier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <!-- Non-ARB extensions sorted by extension number. -->
 
 <category name="GL_EXT_blend_color" number="2">
-- 
cgit v1.2.3