diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-08-25 17:12:03 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-08-25 18:41:21 -0700 |
| commit | 9b387b5d3f4103c51079ea5298d33086af6da433 (patch) | |
| tree | 4127f2284b6b4a5746bbc01bbfc6a97305057cb4 /src/mapi | |
| parent | 5360edcb304e147341b934567f3bbf40e9d5a3b5 (diff) | |
| parent | 1d2a844e7d55645ea3d24fb589bec03695b3d2b1 (diff) | |
| download | external_mesa3d-9b387b5d3f4103c51079ea5298d33086af6da433.zip external_mesa3d-9b387b5d3f4103c51079ea5298d33086af6da433.tar.gz external_mesa3d-9b387b5d3f4103c51079ea5298d33086af6da433.tar.bz2 | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/glapi/gen/GL4x.xml | 6 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/Makefile.am | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/mapi/glapi/gen/GL4x.xml b/src/mapi/glapi/gen/GL4x.xml index 94ddfb7..dee5027 100644 --- a/src/mapi/glapi/gen/GL4x.xml +++ b/src/mapi/glapi/gen/GL4x.xml @@ -44,4 +44,10 @@ <enum name="DEPTH_STENCIL_TEXTURE_MODE" value="0x90EA"/> </category> +<category name="4.5"> + <function name="MemoryBarrierByRegion" es2="3.1"> + <param name="barriers" type="GLbitfield"/> + </function> +</category> + </OpenGLAPI> diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 7d9d1a6..86a9243 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -154,6 +154,7 @@ API_XML = \ ARB_shader_image_load_store.xml \ ARB_shader_subroutine.xml \ ARB_sync.xml \ + ARB_tessellation_shader.xml \ ARB_texture_barrier.xml \ ARB_texture_buffer_object.xml \ ARB_texture_buffer_range.xml \ |