From 513384d7e8db294d54a910f40c90492c211abc54 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 28 Mar 2016 17:27:27 -0600 Subject: [PATCH] mesa: make _mesa_prepare_mipmap_level() static MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit No longer called from any other file. Reviewed-by: José Fonseca Reviewed-by: Roland Scheidegger Reviewed-by: Ian Romanick Tested-by: Ian Romanick --- src/mesa/main/mipmap.c | 16 ++++++++-------- src/mesa/main/mipmap.h | 7 ------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c index cb9afdef2af..5ff53f4265c 100644 --- a/src/mesa/main/mipmap.c +++ b/src/mesa/main/mipmap.c @@ -1810,11 +1810,11 @@ _mesa_next_mipmap_level_size(GLenum target, GLint border, * for mipmap generation. If not, (re) allocate it. * \return GL_TRUE if successful, GL_FALSE if mipmap generation should stop */ -GLboolean -_mesa_prepare_mipmap_level(struct gl_context *ctx, - struct gl_texture_object *texObj, GLuint level, - GLsizei width, GLsizei height, GLsizei depth, - GLsizei border, GLenum intFormat, mesa_format format) +static GLboolean +prepare_mipmap_level(struct gl_context *ctx, + struct gl_texture_object *texObj, GLuint level, + GLsizei width, GLsizei height, GLsizei depth, + GLsizei border, GLenum intFormat, mesa_format format) { const GLuint numFaces = _mesa_num_tex_faces(texObj->Target); GLuint face; @@ -1902,9 +1902,9 @@ _mesa_prepare_mipmap_levels(struct gl_context *ctx, break; } - if (!_mesa_prepare_mipmap_level(ctx, texObj, level, - newWidth, newHeight, newDepth, - border, intFormat, texFormat)) { + if (!prepare_mipmap_level(ctx, texObj, level, + newWidth, newHeight, newDepth, + border, intFormat, texFormat)) { break; } diff --git a/src/mesa/main/mipmap.h b/src/mesa/main/mipmap.h index 33913e88417..d11c7fada37 100644 --- a/src/mesa/main/mipmap.h +++ b/src/mesa/main/mipmap.h @@ -40,13 +40,6 @@ _mesa_generate_mipmap_level(GLenum target, GLubyte **dstData, GLint dstRowStride); - -extern GLboolean -_mesa_prepare_mipmap_level(struct gl_context *ctx, - struct gl_texture_object *texObj, GLuint level, - GLsizei width, GLsizei height, GLsizei depth, - GLsizei border, GLenum intFormat, mesa_format format); - void _mesa_prepare_mipmap_levels(struct gl_context *ctx, struct gl_texture_object *texObj, -- 2.30.2