swrast: fix choose_depth_texture_level() to respect mipmap filtering state

NOTE: this is a candidate for the 7.9 branch.
This commit is contained in:
Brian Paul
2010-10-04 19:59:23 -06:00
parent d0408cf55d
commit fb5e6f88fc
+10 -5
View File
@@ -2975,11 +2975,16 @@ choose_depth_texture_level(const struct gl_texture_object *tObj, GLfloat lambda)
{
GLint level;
lambda = CLAMP(lambda, tObj->MinLod, tObj->MaxLod);
level = (GLint) lambda;
level = CLAMP(level, tObj->BaseLevel, tObj->_MaxLevel);
if (tObj->MinFilter == GL_NEAREST || tObj->MinFilter == GL_LINEAR) {
/* no mipmapping - use base level */
level = tObj->BaseLevel;
}
else {
/* choose mipmap level */
lambda = CLAMP(lambda, tObj->MinLod, tObj->MaxLod);
level = (GLint) lambda;
level = CLAMP(level, tObj->BaseLevel, tObj->_MaxLevel);
}
return level;
}