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

code refactoring, new next_mipmap_level_size() function

Browse Source 
(cherry picked from commit c22d9152e3)
This commit is contained in:
Brian
2008-02-11 09:43:30 -07:00
committed by Keith Whitwell
parent e93243f8b7
commit 74c64fa748
2 changed files with 54 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/mipmap.c
+51 -26
View File
@@ -900,12 +900,57 @@ _mesa_generate_mipmap_level(GLenum target,
/* no mipmaps, do nothing */
break;
default:
_mesa_problem(ctx, "bad dimensions in _mesa_generate_mipmaps");
_mesa_problem(NULL, "bad dimensions in _mesa_generate_mipmaps");
return;
}
}
/**
* compute next (level+1) image size
* \return GL_FALSE if no smaller size can be generated (eg. src is 1x1x1 size)
*/
static GLboolean
next_mipmap_level_size(GLenum target, GLint border,
GLint srcWidth, GLint srcHeight, GLint srcDepth,
GLint *dstWidth, GLint *dstHeight, GLint *dstDepth)
{
if (srcWidth - 2 * border > 1) {
*dstWidth = (srcWidth - 2 * border) / 2 + 2 * border;
}
else {
*dstWidth = srcWidth; /* can't go smaller */
}
if ((srcHeight - 2 * border > 1) &&
(target != GL_TEXTURE_1D_ARRAY_EXT)) {
*dstHeight = (srcHeight - 2 * border) / 2 + 2 * border;
}
else {
*dstHeight = srcHeight; /* can't go smaller */
}
if ((srcDepth - 2 * border > 1) &&
(target != GL_TEXTURE_2D_ARRAY_EXT)) {
*dstDepth = (srcDepth - 2 * border) / 2 + 2 * border;
}
else {
*dstDepth = srcDepth; /* can't go smaller */
}
if (*dstWidth == srcWidth &&
*dstHeight == srcHeight &&
*dstDepth == srcDepth) {
return GL_FALSE;
}
else {
return GL_TRUE;
}
}
/**
* For GL_SGIX_generate_mipmap:
* Generate a complete set of mipmaps from texObj's base-level image.
@@ -995,6 +1040,7 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
GLint srcWidth, srcHeight, srcDepth;
GLint dstWidth, dstHeight, dstDepth;
GLint border, bytesPerTexel;
GLboolean nextLevel;
/* get src image parameters */
srcImage = _mesa_select_tex_image(ctx, texObj, target, level);
@@ -1004,31 +1050,10 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
srcDepth = srcImage->Depth;
border = srcImage->Border;
/* compute next (level+1) image size */
if (srcWidth - 2 * border > 1) {
dstWidth = (srcWidth - 2 * border) / 2 + 2 * border;
}
else {
dstWidth = srcWidth; /* can't go smaller */
}
if ((srcHeight - 2 * border > 1) &&
(texObj->Target != GL_TEXTURE_1D_ARRAY_EXT)) {
dstHeight = (srcHeight - 2 * border) / 2 + 2 * border;
}
else {
dstHeight = srcHeight; /* can't go smaller */
}
if ((srcDepth - 2 * border > 1) &&
(texObj->Target != GL_TEXTURE_2D_ARRAY_EXT)) {
dstDepth = (srcDepth - 2 * border) / 2 + 2 * border;
}
else {
dstDepth = srcDepth; /* can't go smaller */
}
if (dstWidth == srcWidth &&
dstHeight == srcHeight &&
dstDepth == srcDepth) {
nextLevel = next_mipmap_level_size(target, border,
srcWidth, srcHeight, srcDepth,
&dstWidth, &dstHeight, &dstDepth);
if (!nextLevel) {
/* all done */
if (srcImage->IsCompressed) {
_mesa_free((void *) srcData);
src/mesa/main/mipmap.h
+3 -1
View File
@@ -35,8 +35,10 @@ _mesa_generate_mipmap_level(GLenum target,
GLint border,
GLint srcWidth, GLint srcHeight, GLint srcDepth,
const GLubyte *srcData,
GLint srcRowStride,
GLint dstWidth, GLint dstHeight, GLint dstDepth,
GLubyte *dstData);
GLubyte *dstData,
GLint dstRowStride);
extern void