[Mesa-dev] [PATCH] mesa: add ARB_clear_texture.xml to file list, remove duplicate decls

[Emil Velikov]

On 24/07/14 02:16, Ilia Mirkin wrote:
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
> 
> Noticed while helping jekstrand debug his issues. This didn't help, but seems
> correct.
> 
The former will cause an issue when building without shared-glapi, while the
latter... are just duplicated a few lines above in the same file.

Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>

>  src/mapi/glapi/gen/Makefile.am |  1 +
>  src/mesa/main/teximage.h       | 12 ------------
>  2 files changed, 1 insertion(+), 12 deletions(-)
> 
> diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
> index be7d9e0..212731f 100644
> --- a/src/mapi/glapi/gen/Makefile.am
> +++ b/src/mapi/glapi/gen/Makefile.am
> @@ -112,6 +112,7 @@ API_XML = \
>  	ARB_base_instance.xml \
>  	ARB_blend_func_extended.xml \
>  	ARB_clear_buffer_object.xml \
> +	ARB_clear_texture.xml \
>  	ARB_color_buffer_float.xml \
>  	ARB_compressed_texture_pixel_storage.xml \
>  	ARB_compute_shader.xml \
> diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
> index 984321c..42305f4 100644
> --- a/src/mesa/main/teximage.h
> +++ b/src/mesa/main/teximage.h
> @@ -336,18 +336,6 @@ _mesa_TexStorage3DMultisample(GLenum target, GLsizei samples,
>                                GLsizei height, GLsizei depth,
>                                GLboolean fixedsamplelocations);
>  
> -extern void GLAPIENTRY
> -_mesa_ClearTexImage(GLuint texture, GLint level,
> -                    GLenum format, GLenum type,
> -                    const void *data);
> -
> -extern void GLAPIENTRY
> -_mesa_ClearTexSubImage(GLuint texture, GLint level,
> -                       GLint xoffset, GLint yoffset, GLint zoffset,
> -                       GLsizei width, GLsizei height, GLsizei depth,
> -                       GLenum format, GLenum type,
> -                       const void *data);
> -
>  bool
>  _mesa_compressed_texture_pixel_storage_error_check(struct gl_context *ctx,
>                                               GLint dimensions,
>