diff options
author | Paul Berry <[email protected]> | 2014-01-06 15:08:04 -0800 |
---|---|---|
committer | Paul Berry <[email protected]> | 2014-02-05 09:00:14 -0800 |
commit | 79134cb51609724cc4d94ade12dc52a09e2e91db (patch) | |
tree | 9cb30c5ffc3600d04e07c01b2cbb830ea016271a /src/mapi | |
parent | b7d05a58ae3655730f84c9786439e2461cdb77da (diff) |
mesa/cs: Add dispatch API stubs for ARB_compute_shader.
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mapi')
-rw-r--r-- | src/mapi/glapi/gen/ARB_compute_shader.xml | 40 | ||||
-rw-r--r-- | src/mapi/glapi/gen/Makefile.am | 1 | ||||
-rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 4 | ||||
-rw-r--r-- | src/mapi/glapi/gen/gl_genexec.py | 1 |
4 files changed, 45 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_compute_shader.xml b/src/mapi/glapi/gen/ARB_compute_shader.xml new file mode 100644 index 00000000000..1db373e9901 --- /dev/null +++ b/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/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 7354725df9c..9e6fe52612f 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/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/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 193ee370c0d..0715bbf8176 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -8466,7 +8466,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/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py index 982286a3c12..1765a51ad26 100644 --- a/src/mapi/glapi/gen/gl_genexec.py +++ b/src/mapi/glapi/gen/gl_genexec.py @@ -58,6 +58,7 @@ header = """/** #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" |