diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-12 13:48:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-12 13:48:18 +0000 |
| commit | e2c8d047679db3bbb166d709b86e18180be6d713 (patch) | |
| tree | d7468ac76dc71bb8d38c816be6db988bcbcbb863 /mesalib/src/mesa/drivers/dri/common | |
| parent | 57fb3f76b66c5f7a9f7bed9c42fb9fec9d56ee05 (diff) | |
| parent | 7730393619080086530e24d3b594351b4114f608 (diff) | |
| download | vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.tar.gz vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.tar.bz2 vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/common')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/texmem.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/texmem.c b/mesalib/src/mesa/drivers/dri/common/texmem.c index 3c4f3373f..03c15c895 100644 --- a/mesalib/src/mesa/drivers/dri/common/texmem.c +++ b/mesalib/src/mesa/drivers/dri/common/texmem.c @@ -1264,17 +1264,18 @@ driCalculateTextureFirstLastLevel( driTextureObject * t ) case GL_TEXTURE_2D:
case GL_TEXTURE_3D:
case GL_TEXTURE_CUBE_MAP:
- if (tObj->MinFilter == GL_NEAREST || tObj->MinFilter == GL_LINEAR) {
+ if (tObj->Sampler.MinFilter == GL_NEAREST ||
+ tObj->Sampler.MinFilter == GL_LINEAR) {
/* GL_NEAREST and GL_LINEAR only care about GL_TEXTURE_BASE_LEVEL.
*/
firstLevel = lastLevel = tObj->BaseLevel;
}
else {
- firstLevel = tObj->BaseLevel + (GLint)(tObj->MinLod + 0.5);
+ firstLevel = tObj->BaseLevel + (GLint)(tObj->Sampler.MinLod + 0.5);
firstLevel = MAX2(firstLevel, tObj->BaseLevel);
firstLevel = MIN2(firstLevel, tObj->BaseLevel + baseImage->MaxLog2);
- lastLevel = tObj->BaseLevel + (GLint)(tObj->MaxLod + 0.5);
+ lastLevel = tObj->BaseLevel + (GLint)(tObj->Sampler.MaxLod + 0.5);
lastLevel = MAX2(lastLevel, t->tObj->BaseLevel);
lastLevel = MIN2(lastLevel, t->tObj->BaseLevel + baseImage->MaxLog2);
lastLevel = MIN2(lastLevel, t->tObj->MaxLevel);
|