projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d0408cf
)
swrast: fix choose_depth_texture_level() to respect mipmap filtering state
author
Brian Paul
<brianp@vmware.com>
Tue, 5 Oct 2010 01:59:23 +0000
(19:59 -0600)
committer
Brian Paul
<brianp@vmware.com>
Tue, 5 Oct 2010 01:59:46 +0000
(19:59 -0600)
NOTE: this is a candidate for the 7.9 branch.
src/mesa/swrast/s_texfilter.c
patch
|
blob
|
history
diff --git
a/src/mesa/swrast/s_texfilter.c
b/src/mesa/swrast/s_texfilter.c
index
de694c3
..
e5ffe8f
100644
(file)
--- a/
src/mesa/swrast/s_texfilter.c
+++ b/
src/mesa/swrast/s_texfilter.c
@@
-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;
}