summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r--src/mesa/state_tracker/st_gen_mipmap.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/src/mesa/state_tracker/st_gen_mipmap.c b/src/mesa/state_tracker/st_gen_mipmap.c
index 16b914a8845..f2aa8005a03 100644
--- a/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/src/mesa/state_tracker/st_gen_mipmap.c
@@ -45,32 +45,6 @@
/**
- * Compute the expected number of mipmap levels in the texture given
- * the width/height/depth of the base image and the GL_TEXTURE_BASE_LEVEL/
- * GL_TEXTURE_MAX_LEVEL settings. This will tell us how many mipmap
- * levels should be generated.
- */
-static GLuint
-compute_num_levels(struct gl_context *ctx,
- struct gl_texture_object *texObj,
- GLenum target)
-{
- const struct gl_texture_image *baseImage;
- GLuint numLevels;
-
- baseImage = _mesa_get_tex_image(ctx, texObj, target, texObj->BaseLevel);
-
- numLevels = texObj->BaseLevel + baseImage->MaxNumLevels;
- numLevels = MIN2(numLevels, (GLuint) texObj->MaxLevel + 1);
- if (texObj->Immutable)
- numLevels = MIN2(numLevels, texObj->NumLevels);
- assert(numLevels >= 1);
-
- return numLevels;
-}
-
-
-/**
* Called via ctx->Driver.GenerateMipmap().
*/
void
@@ -92,7 +66,7 @@ st_generate_mipmap(struct gl_context *ctx, GLenum target,
assert(pt->nr_samples < 2);
/* find expected last mipmap level to generate*/
- lastLevel = compute_num_levels(ctx, texObj, target) - 1;
+ lastLevel = _mesa_compute_num_levels(ctx, texObj, target) - 1;
if (lastLevel == 0)
return;