From: Nicolai Haehnle <nhaehnle@gmail.com>
Date: Sat, 7 Jun 2008 12:17:56 +0000 (+0200)
Subject: r300: Reenable t->filter_1 (though currently not used)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b1056b6127d2bd6fa39ba7d88b5a49cd2765c469;p=mesa.git

r300: Reenable t->filter_1 (though currently not used)
---

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index b36ca7aef85..c3f1cc9e287 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1441,8 +1441,7 @@ static void r300SetupTextures(GLcontext * ctx)
 			r300->hw.tex.filter.cmd[R300_TEX_VALUE_0 +
 						hw_tmu] =
 			    gen_fixed_filter(t->filter) | (hw_tmu << 28);
-			/* Currently disabled! */
-			r300->hw.tex.filter_1.cmd[R300_TEX_VALUE_0 + hw_tmu] = 0x0;	//0x20501f80;
+			r300->hw.tex.filter_1.cmd[R300_TEX_VALUE_0 + hw_tmu] = t->filter_1;
 			r300->hw.tex.size.cmd[R300_TEX_VALUE_0 + hw_tmu] =
 			    t->size;
 			r300->hw.tex.format.cmd[R300_TEX_VALUE_0 +