From: Ilia Mirkin Date: Thu, 24 Jul 2014 01:10:51 +0000 (-0400) Subject: mesa: add ARB_clear_texture.xml to file list, remove duplicate decls X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=637b6c24785d202e0f608c8dec098d63d857ae0e;p=mesa.git mesa: add ARB_clear_texture.xml to file list, remove duplicate decls Signed-off-by: Ilia Mirkin Reviewed-by: Emil Velikov --- diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index be7d9e0efdb..212731fa404 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 984321c2100..42305f44f0b 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,