Mesa (master): mesa: Move compute_num_levels from st_gen_mipmap.c to mipmap.c.
Kenneth Graunke
kwg at kemper.freedesktop.org
Fri Feb 16 18:49:42 UTC 2018
Module: Mesa
Branch: master
Commit: 9bcd31ea90addd7a16802de8a28b2f3242dc8298
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9bcd31ea90addd7a16802de8a28b2f3242dc8298
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sun Jun 19 00:36:48 2016 -0700
mesa: Move compute_num_levels from st_gen_mipmap.c to mipmap.c.
I want to use compute_num_levels inside i965. Rather than duplicating
it, move it from mesa/st to core Mesa, and make it non-static.
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
---
src/mesa/main/mipmap.c | 24 ++++++++++++++++++++++++
src/mesa/main/mipmap.h | 4 ++++
src/mesa/state_tracker/st_gen_mipmap.c | 28 +---------------------------
3 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index fc36d408f9..1ed82c52ab 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -42,6 +42,30 @@
#include "util/format_r11g11b10f.h"
+/**
+ * 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.
+ */
+unsigned
+_mesa_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;
+}
static GLint
bytes_per_pixel(GLenum datatype, GLuint comps)
diff --git a/src/mesa/main/mipmap.h b/src/mesa/main/mipmap.h
index d11c7fada3..1f108f7e5d 100644
--- a/src/mesa/main/mipmap.h
+++ b/src/mesa/main/mipmap.h
@@ -28,6 +28,10 @@
#include "mtypes.h"
+unsigned
+_mesa_compute_num_levels(struct gl_context *ctx,
+ struct gl_texture_object *texObj,
+ GLenum target);
extern void
_mesa_generate_mipmap_level(GLenum target,
diff --git a/src/mesa/state_tracker/st_gen_mipmap.c b/src/mesa/state_tracker/st_gen_mipmap.c
index 16b914a884..f2aa8005a0 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;
More information about the mesa-commit
mailing list