aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi/gen
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-02-07 23:46:30 +0100
committermarha <marha@users.sourceforge.net>2014-02-07 23:46:30 +0100
commit6daf40f6b1138efad98dbb579cd35520cbc349bb (patch)
tree7f45dbb347f5e1a73b18a720633b9d801c968490 /mesalib/src/mapi/glapi/gen
parent5c64f94cf4cf8457a5616fe20b9a27174895f1a8 (diff)
parent982ac918afe6a1c02d5cf735d7b6c56443a048cc (diff)
downloadvcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.tar.gz
vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.tar.bz2
vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014 Conflicts: mesalib/src/glsl/glcpp/glcpp.c openssl/Makefile
Diffstat (limited to 'mesalib/src/mapi/glapi/gen')
-rw-r--r--mesalib/src/mapi/glapi/gen/ARB_compute_shader.xml40
-rw-r--r--mesalib/src/mapi/glapi/gen/ARB_gpu_shader5.xml15
-rw-r--r--mesalib/src/mapi/glapi/gen/Makefile.am1
-rwxr-xr-xmesalib/src/mapi/glapi/gen/gl_API.xml6
-rw-r--r--mesalib/src/mapi/glapi/gen/gl_genexec.py3
5 files changed, 64 insertions, 1 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_compute_shader.xml b/mesalib/src/mapi/glapi/gen/ARB_compute_shader.xml
new file mode 100644
index 000000000..1db373e99
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_compute_shader.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+
+<OpenGLAPI>
+
+<category name="GL_ARB_compute_shader" number="122">
+ <enum name="COMPUTE_SHADER" value="0x91B9"/>
+ <enum name="MAX_COMPUTE_UNIFORM_BLOCKS" value="0x91BB"/>
+ <enum name="MAX_COMPUTE_TEXTURE_IMAGE_UNITS" value="0x91BC"/>
+ <enum name="MAX_COMPUTE_IMAGE_UNIFORMS" value="0x91BD"/>
+ <enum name="MAX_COMPUTE_SHARED_MEMORY_SIZE" value="0x8262"/>
+ <enum name="MAX_COMPUTE_UNIFORM_COMPONENTS" value="0x8263"/>
+ <enum name="MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS" value="0x8264"/>
+ <enum name="MAX_COMPUTE_ATOMIC_COUNTERS" value="0x8265"/>
+ <enum name="MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS" value="0x8266"/>
+ <enum name="MAX_COMPUTE_WORK_GROUP_INVOCATIONS" value="0x90EB"/>
+ <enum name="MAX_COMPUTE_WORK_GROUP_COUNT" value="0x91BE"/>
+ <enum name="MAX_COMPUTE_WORK_GROUP_SIZE" value="0x91BF"/>
+ <enum name="COMPUTE_WORK_GROUP_SIZE" value="0x8267"/>
+ <enum name="UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER" value="0x90EC"/>
+ <enum name="ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER" value="0x90ED"/>
+ <enum name="DISPATCH_INDIRECT_BUFFER" value="0x90EE"/>
+ <enum name="DISPATCH_INDIRECT_BUFFER_BINDING" value="0x90EF"/>
+ <enum name="COMPUTE_SHADER_BIT" value="0x00000020"/>
+
+ <function name="DispatchCompute" offset="assign">
+ <param name="num_groups_x" type="GLuint"/>
+ <param name="num_groups_y" type="GLuint"/>
+ <param name="num_groups_z" type="GLuint"/>
+ </function>
+
+ <function name="DispatchComputeIndirect" offset="assign">
+ <param name="indirect" type="GLintptr"/>
+ </function>
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_gpu_shader5.xml b/mesalib/src/mapi/glapi/gen/ARB_gpu_shader5.xml
new file mode 100644
index 000000000..f915b48d3
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_gpu_shader5.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_gpu_shader5" number="88">
+ <enum name="GEOMETRY_SHADER_INVOCATIONS" value="0x887F"/>
+ <enum name="MAX_GEOMETRY_SHADER_INVOCATIONS" value="0x8E5A"/>
+ <enum name="MIN_FRAGMENT_INTERPOLATION_OFFSET" value="0x8E5B"/>
+ <enum name="MAX_FRAGMENT_INTERPOLATION_OFFSET" value="0x8E5C"/>
+ <enum name="FRAGMENT_INTERPOLATION_OFFSET_BITS" value="0x8E5D"/>
+ <enum name="MAX_VERTEX_STREAMS" value="0x8E71"/>
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am
index 7354725df..9e6fe5261 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile.am
+++ b/mesalib/src/mapi/glapi/gen/Makefile.am
@@ -91,6 +91,7 @@ API_XML = \
ARB_base_instance.xml \
ARB_blend_func_extended.xml \
ARB_color_buffer_float.xml \
+ ARB_compute_shader.xml \
ARB_copy_buffer.xml \
ARB_debug_output.xml \
ARB_depth_buffer_float.xml \
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 4b1a93f68..d5467a823 100755
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -8243,6 +8243,8 @@
<xi:include href="ARB_draw_indirect.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_gpu_shader5.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
<category name="GL_ARB_transform_feedback3" number="94">
<enum name="MAX_TRANSFORM_FEEDBACK_BUFFERS" value="0x8E70"/>
<enum name="MAX_VERTEX_STREAMS" value="0x8E71"/>
@@ -8466,7 +8468,9 @@
<xi:include href="ARB_clear_buffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-<!-- ARB extensions #122...#123 -->
+<xi:include href="ARB_compute_shader.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extension #123 -->
<xi:include href="ARB_texture_view.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
diff --git a/mesalib/src/mapi/glapi/gen/gl_genexec.py b/mesalib/src/mapi/glapi/gen/gl_genexec.py
index b7ac16b06..1765a51ad 100644
--- a/mesalib/src/mapi/glapi/gen/gl_genexec.py
+++ b/mesalib/src/mapi/glapi/gen/gl_genexec.py
@@ -51,12 +51,14 @@ header = """/**
#include "main/atifragshader.h"
#include "main/attrib.h"
#include "main/blend.h"
+#include "main/blit.h"
#include "main/bufferobj.h"
#include "main/arrayobj.h"
#include "main/buffers.h"
#include "main/clear.h"
#include "main/clip.h"
#include "main/colortab.h"
+#include "main/compute.h"
#include "main/condrender.h"
#include "main/context.h"
#include "main/convolve.h"
@@ -74,6 +76,7 @@ header = """/**
#include "main/fog.h"
#include "main/fbobject.h"
#include "main/framebuffer.h"
+#include "main/genmipmap.h"
#include "main/hint.h"
#include "main/histogram.h"
#include "main/imports.h"