KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@amd.com>
This commit is contained in:
Kenneth Graunke 2016-06-19 00:36:48 -07:00
parent 03ab40b1f7
commit 9bcd31ea90
3 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mesa/main/mipmap.c
View File

@ -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)

4
src/mesa/main/mipmap.h
View File

@ -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,

28
src/mesa/state_tracker/st_gen_mipmap.c
View File

@ -44,32 +44,6 @@
#include "st_cb_texture.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.
*/
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().
*/
@ -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;