summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2016-03-28 17:27:27 -0600
committerBrian Paul <[email protected]>2016-03-29 18:13:46 -0600
commit513384d7e8db294d54a910f40c90492c211abc54 (patch)
tree98810d5f2b8212eb4740a55ef5a650959388e49f
parented39de90f1cd209b10baeed8ae98b1f56127c8de (diff)
mesa: make _mesa_prepare_mipmap_level() static
No longer called from any other file. Reviewed-by: José Fonseca <[email protected]> Reviewed-by: Roland Scheidegger <[email protected]> Reviewed-by: Ian Romanick <[email protected]> Tested-by: Ian Romanick <[email protected]>
-rw-r--r--src/mesa/main/mipmap.c16
-rw-r--r--src/mesa/main/mipmap.h7
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,