diff options
| -rw-r--r-- | docs/GL3.txt | 2 | ||||
| -rw-r--r-- | docs/relnotes/10.3.html | 1 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/ARB_texture_barrier.xml | 13 | ||||
| -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/mesa/main/extensions.c | 1 |
6 files changed, 21 insertions, 1 deletions
diff --git a/docs/GL3.txt b/docs/GL3.txt index e4610b2cc8e..298f8d7f9a5 100644 --- a/docs/GL3.txt +++ b/docs/GL3.txt @@ -192,7 +192,7 @@ GL 4.5, GLSL 4.50: GL_ARB_direct_state_access not started GL_ARB_get_texture_sub_image started (Brian Paul) GL_ARB_shader_texture_image_samples not started - GL_ARB_texture_barrier started (Ilia Mirkin) + GL_ARB_texture_barrier DONE (nv50, nvc0, r300, r600, radeonsi) GL_KHR_context_flush_control not started GL_KHR_robust_buffer_access_behavior not started GL_KHR_robustness 90% done (the ARB variant) diff --git a/docs/relnotes/10.3.html b/docs/relnotes/10.3.html index 556eaaec35a..66745b8db2b 100644 --- a/docs/relnotes/10.3.html +++ b/docs/relnotes/10.3.html @@ -55,6 +55,7 @@ Note: some of the new features are only available with certain drivers. <li>GL_ARB_sample_shading on radeonsi</li> <li>GL_ARB_seamless_cubemap_per_texture on i965, llvmpipe, nvc0, r600, radeonsi, softpipe</li> <li>GL_ARB_stencil_texturing on nv50, nvc0, r600, and radeonsi</li> +<li>GL_ARB_texture_barrier on nv50, nvc0, r300, r600, radeonsi</li> <li>GL_ARB_texture_compression_bptc on i965/gen7+, nvc0, r600/evergreen+, radeonsi</li> <li>GL_ARB_texture_cube_map_array on radeonsi</li> <li>GL_ARB_texture_gather on r600, radeonsi</li> diff --git a/src/mapi/glapi/gen/ARB_texture_barrier.xml b/src/mapi/glapi/gen/ARB_texture_barrier.xml new file mode 100644 index 00000000000..7119732c8ea --- /dev/null +++ b/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/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 645def4ef5c..2fbc5980660 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/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/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 619717d9e9e..a37ee4f63b4 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -8364,6 +8364,10 @@ <xi:include href="ARB_multi_bind.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<!-- ARB extensions 148 - 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"> diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index ba26e46110b..00250ab1d8d 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -152,6 +152,7 @@ static const struct extension extension_table[] = { { "GL_ARB_shadow", o(ARB_shadow), GLL, 2001 }, { "GL_ARB_stencil_texturing", o(ARB_stencil_texturing), GL, 2012 }, { "GL_ARB_sync", o(ARB_sync), GL, 2003 }, + { "GL_ARB_texture_barrier", o(NV_texture_barrier), GL, 2014 }, { "GL_ARB_texture_border_clamp", o(ARB_texture_border_clamp), GLL, 2000 }, { "GL_ARB_texture_buffer_object", o(ARB_texture_buffer_object), GLC, 2008 }, { "GL_ARB_texture_buffer_object_rgb32", o(ARB_texture_buffer_object_rgb32), GLC, 2009 }, |