From: Corbin Simpson Date: Sat, 14 Jun 2008 11:37:09 +0000 (-0700) Subject: r3xx/r5xx: Don't force aniso. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9704414d1376d449ad6a006a16be8139f82b5d81;p=mesa.git r3xx/r5xx: Don't force aniso. *Pulls paper bag down over head* --- 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