OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new _mesa_max_texture_levels() helper function - not used everywhere yet

Browse Source
This commit is contained in:
Brian Paul
2002-10-18 18:03:04 +00:00
parent 53d30c56eb
commit ef31f60b12
3 changed files with 48 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/mesa/main/teximage.c
View File

@@ -1,4 +1,4 @@
/* $Id: teximage.c,v 1.121 2002/10/18 13:24:08 brianp Exp $ */
/* $Id: teximage.c,v 1.122 2002/10/18 18:03:04 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -583,6 +583,41 @@ _mesa_select_tex_image(GLcontext *ctx, const struct gl_texture_unit *texUnit,
}
/*
* Return the maximum number of allows mipmap levels for the given
* texture target.
*/
GLint
_mesa_max_texture_levels(GLcontext *ctx, GLenum target)
{
switch (target) {
case GL_TEXTURE_1D:
case GL_PROXY_TEXTURE_1D:
case GL_TEXTURE_2D:
case GL_PROXY_TEXTURE_2D:
return ctx->Const.MaxTextureLevels;
case GL_TEXTURE_3D:
case GL_PROXY_TEXTURE_3D:
return ctx->Const.Max3DTextureLevels;
case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
return ctx->Const.MaxCubeTextureLevels;
break;
case GL_TEXTURE_RECTANGLE_NV:
case GL_PROXY_TEXTURE_RECTANGLE_NV:
return 1;
break;
default:
return 0; /* bad target */
}
}
#if 000 /* not used anymore */
/*
@@ -1455,20 +1490,8 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format,
return;
}
if (target == GL_TEXTURE_1D || target == GL_TEXTURE_2D) {
maxLevels = ctx->Const.MaxTextureLevels;
}
else if (target == GL_TEXTURE_3D) {
maxLevels = ctx->Const.Max3DTextureLevels;
}
else if (target == GL_TEXTURE_RECTANGLE_NV) {
maxLevels = 1;
}
else {
maxLevels = ctx->Const.MaxCubeTextureLevels;
}
ASSERT(maxLevels > 0);
maxLevels = _mesa_max_texture_levels(ctx, target);
ASSERT(maxLevels > 0); /* 0 indicates bad target, caught above */
if (level < 0 || level >= maxLevels) {
_mesa_error( ctx, GL_INVALID_VALUE, "glGetTexImage(level)" );
@@ -2887,17 +2910,8 @@ _mesa_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid *img)
return;
}
if (target == GL_TEXTURE_1D || target == GL_TEXTURE_2D) {
maxLevels = ctx->Const.MaxTextureLevels;
}
else if (target == GL_TEXTURE_3D) {
maxLevels = ctx->Const.Max3DTextureLevels;
}
else {
maxLevels = ctx->Const.MaxCubeTextureLevels;
}
ASSERT(maxLevels > 0);
maxLevels = _mesa_max_texture_levels(ctx, target);
ASSERT(maxLevels > 0); /* 0 indicates bad target, caught above */
if (level < 0 || level >= maxLevels) {
_mesa_error(ctx, GL_INVALID_VALUE, "glGetCompressedTexImageARB(level)");

5
src/mesa/main/teximage.h
View File

@@ -1,4 +1,4 @@
/* $Id: teximage.h,v 1.21 2002/06/15 03:03:09 brianp Exp $ */
/* $Id: teximage.h,v 1.22 2002/10/18 18:03:07 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -70,6 +70,9 @@ _mesa_select_tex_image(GLcontext *ctx, const struct gl_texture_unit *texUnit,
GLenum target, GLint level);
extern GLint
_mesa_max_texture_levels(GLcontext *ctx, GLenum target);
/*** API entry point functions ***/

28
src/mesa/main/texstore.c
View File

@@ -1,4 +1,4 @@
/* $Id: texstore.c,v 1.43 2002/10/18 17:41:45 brianp Exp $ */
/* $Id: texstore.c,v 1.44 2002/10/18 18:03:08 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -1897,34 +1897,14 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
const struct gl_texture_format *convertFormat;
const GLubyte *srcData;
GLubyte *dstData;
GLint level;
GLint maxLevels = 0;
GLint level, maxLevels;
ASSERT(texObj);
srcImage = texObj->Image[texObj->BaseLevel];
ASSERT(srcImage);
switch (texObj->Target) {
case GL_TEXTURE_1D:
maxLevels = ctx->Const.MaxTextureLevels;
break;
case GL_TEXTURE_2D:
maxLevels = ctx->Const.MaxTextureLevels;
break;
case GL_TEXTURE_3D:
maxLevels = ctx->Const.Max3DTextureLevels;
break;
case GL_TEXTURE_CUBE_MAP_ARB:
maxLevels = ctx->Const.MaxCubeTextureLevels;
break;
case GL_TEXTURE_RECTANGLE_NV:
maxLevels = 1;
break;
default:
_mesa_problem(ctx,
"Bad texture object dimension in _mesa_generate_mipmaps");
return;
}
maxLevels = _mesa_max_texture_levels(ctx, texObj->Target);
ASSERT(maxLevels > 0); /* bad target */
/* Find convertFormat - the format that do_row() will process */
if (srcImage->IsCompressed) {