[Mesa-dev] [PATCH v2 4/5] mesa: add ARB_texture_barrier support

[Ilia Mirkin]

Any chance this can get reviewed before the 10.3 cutoff tomorrow? I
copied one of the existing nv_texture_barrier piglits and made use of
glTextureBarrier() instead, and it still passed.

On Mon, Aug 11, 2014 at 4:01 PM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> This extension is identical to NV_texture_barrier. Alias
> glTextureBarrier to the existing glTextureBarrierNV and use the existing
> NV_texture_barrier extension bit.
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>
> v1 -> v2:
>  - Add the actual extension string
>  - Remove separate (and missing dlist bits) TextureBarrier implementation
>    in favor of aliasing approach.
>
>  src/mapi/glapi/gen/ARB_texture_barrier.xml | 13 +++++++++++++
>  src/mapi/glapi/gen/Makefile.am             |  1 +
>  src/mapi/glapi/gen/gl_API.xml              |  4 ++++
>  src/mesa/main/extensions.c                 |  1 +
>  4 files changed, 19 insertions(+)
>  create mode 100644 src/mapi/glapi/gen/ARB_texture_barrier.xml
>
> 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 0000000..7119732
> --- /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 212731f..2cc2752 100644
> --- a/src/mapi/glapi/gen/Makefile.am
> +++ b/src/mapi/glapi/gen/Makefile.am
> @@ -144,6 +144,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 e011509..ccf3b9a 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 9ac8377..311f6ce 100644
> --- a/src/mesa/main/extensions.c
> +++ b/src/mesa/main/extensions.c
> @@ -151,6 +151,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 },
> --
> 1.8.5.5
>