From 048de9e34a2214371481143cddcaa53f52468c6b Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 21 Jun 2017 09:41:50 +0200 Subject: [PATCH] mesa: remove unused _mesa_delete_nameless_texture() Signed-off-by: Samuel Pitoiset Reviewed-by: Timothy Arceri --- src/mesa/main/texobj.c | 41 ----------------------------------------- src/mesa/main/texobj.h | 5 ----- 2 files changed, 46 deletions(-) diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index ed1eaf9b77b..a5988159a57 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1495,47 +1495,6 @@ _mesa_DeleteTextures( GLsizei n, const GLuint *textures) } } -/** - * This deletes a texObj without altering the hash table. - */ -void -_mesa_delete_nameless_texture(struct gl_context *ctx, - struct gl_texture_object *texObj) -{ - if (!texObj) - return; - - FLUSH_VERTICES(ctx, 0); - - _mesa_lock_texture(ctx, texObj); - { - /* Check if texture is bound to any framebuffer objects. - * If so, unbind. - * See section 4.4.2.3 of GL_EXT_framebuffer_object. - */ - unbind_texobj_from_fbo(ctx, texObj); - - /* Check if this texture is currently bound to any texture units. - * If so, unbind it. - */ - unbind_texobj_from_texunits(ctx, texObj); - - /* Check if this texture is currently bound to any shader - * image unit. If so, unbind it. - * See section 3.9.X of GL_ARB_shader_image_load_store. - */ - unbind_texobj_from_image_units(ctx, texObj); - } - _mesa_unlock_texture(ctx, texObj); - - ctx->NewState |= _NEW_TEXTURE_OBJECT; - - /* Unreference the texobj. If refcount hits zero, the texture - * will be deleted. - */ - _mesa_reference_texobj(&texObj, NULL); -} - /** * Convert a GL texture target enum such as GL_TEXTURE_2D or GL_TEXTURE_3D diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h index a9db1675e01..1c68bd8ec7d 100644 --- a/src/mesa/main/texobj.h +++ b/src/mesa/main/texobj.h @@ -170,11 +170,6 @@ _mesa_unlock_context_textures( struct gl_context *ctx ); extern void _mesa_lock_context_textures( struct gl_context *ctx ); -extern void -_mesa_delete_nameless_texture(struct gl_context *ctx, - struct gl_texture_object *texObj); - - /*@}*/ /** -- 2.30.2