fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-09 21:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Correct clamping of TEXTURE_{MAX, BASE}_LEVEL

Browse source 
Previously, if TEXTURE_IMMUTABLE_FORMAT was TRUE, the levels were allowed to
be set like usual, but ARB_texture_storage states:

> if TEXTURE_IMMUTABLE_FORMAT is TRUE, then level_base is clamped to the range
> [0, <levels> - 1] and level_max is then clamped to the range [level_base,
> <levels> - 1], where <levels> is the parameter passed the call to
> TexStorage* for the texture object

Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Corey Richardson <corey@octayn.net>
This commit is contained in:
Corey Richardson 2013-07-31 10:46:12 -04:00 • committed by Matt Turner
parent 986ae4306c
commit abdbd02e59
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/mesa/main/texparam.c
View file

@ -386,7 +386,13 @@ set_tex_parameteri(struct gl_context *ctx,
return GL_FALSE;
}
incomplete(ctx, texObj);
texObj->BaseLevel = params[0];
/** See note about ARB_texture_storage below */
if (texObj->Immutable)
texObj->BaseLevel = MIN2(texObj->ImmutableLevels - 1, params[0]);
else
texObj->BaseLevel = params[0];
return GL_TRUE;
case GL_TEXTURE_MAX_LEVEL:
@ -399,7 +405,19 @@ set_tex_parameteri(struct gl_context *ctx,
return GL_FALSE;
}
incomplete(ctx, texObj);
texObj->MaxLevel = params[0];
/** From ARB_texture_storage:
* However, if TEXTURE_IMMUTABLE_FORMAT is TRUE, then level_base is
* clamped to the range [0, <levels> - 1] and level_max is then clamped to
* the range [level_base, <levels> - 1], where <levels> is the parameter
* passed the call to TexStorage* for the texture object.
*/
if (texObj->Immutable)
texObj->MaxLevel = CLAMP(params[0], texObj->BaseLevel,
texObj->ImmutableLevels - 1);
else
texObj->MaxLevel = params[0];
return GL_TRUE;
case GL_GENERATE_MIPMAP_SGIS: