From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Sat, 7 Jun 2008 19:37:10 +0000 (-0700)
Subject: r300: Allow driconf to set a default anisotropy.
X-Git-Tag: 062012170305~18547
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21f50818b09c1ab3b5b1dc797b34c23b9b1634dc;p=profile%2Fivi%2Fmesa.git

r300: Allow driconf to set a default anisotropy.
If an app does not use GL_EXT_tex_filter_aniso, this lets driconf set it instead.
---

diff --git a/src/mesa/drivers/dri/r300/r300_tex.c b/src/mesa/drivers/dri/r300/r300_tex.c
index a12b029..2c3c28e 100644
--- a/src/mesa/drivers/dri/r300/r300_tex.c
+++ b/src/mesa/drivers/dri/r300/r300_tex.c
@@ -191,13 +191,15 @@ static void r300SetTexFilter(r300TexObjPtr t, GLenum minf, GLenum magf, GLfloat
 	/* Note that EXT_texture_filter_anisotropic is extremely vague about
 	 * how anisotropic filtering interacts with the "normal" filter modes.
 	 * When anisotropic filtering is enabled, we override min and mag
-	 * filter settings.
+	 * filter settings completely. This includes driconf's settings.
 	 */
-	if (anisotropy >= 2.0 && (minf != GL_NEAREST && minf != GL_LINEAR)) {
+	if (anisotropy >= 2.0) {
 		t->filter |= R300_TX_MAG_FILTER_ANISO
 			| R300_TX_MIN_FILTER_ANISO
 			| R300_TX_MIN_FILTER_MIP_LINEAR
 			| aniso_filter(anisotropy);
+		if (RADEON_DEBUG & DEBUG_TEXTURE)
+			fprintf(stderr, "Using maximum anisotropy of %f\n", anisotropy);
 		return;
 	}