summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorCorbin Simpson <[email protected]>2008-06-14 04:37:09 -0700
committerCorbin Simpson <[email protected]>2008-06-14 04:37:09 -0700
commit9704414d1376d449ad6a006a16be8139f82b5d81 (patch)
tree0cb98b347211a3614af1377caf2d6778fd87fe0e /src/mesa/drivers
parenta1c0c56d70308a562c90cc01982c89ed1396c830 (diff)
r3xx/r5xx: Don't force aniso.
*Pulls paper bag down over head*
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/r300/r300_tex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_tex.c b/src/mesa/drivers/dri/r300/r300_tex.c
index 2c3c28e6386..16321af7d46 100644
--- a/src/mesa/drivers/dri/r300/r300_tex.c
+++ b/src/mesa/drivers/dri/r300/r300_tex.c
@@ -193,7 +193,7 @@ static void r300SetTexFilter(r300TexObjPtr t, GLenum minf, GLenum magf, GLfloat
* When anisotropic filtering is enabled, we override min and mag
* filter settings completely. This includes driconf's settings.
*/
- if (anisotropy >= 2.0) {
+ if (anisotropy >= 2.0 && (minf != GL_NEAREST) && (magf != GL_NEAREST)) {
t->filter |= R300_TX_MAG_FILTER_ANISO
| R300_TX_MIN_FILTER_ANISO
| R300_TX_MIN_FILTER_MIP_LINEAR