projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1087cc6)
r300: Reenable t->filter_1 (though currently not used)
authorNicolai Haehnle <nhaehnle@gmail.com>
Sat, 7 Jun 2008 12:17:56 +0000 (14:17 +0200)
committerNicolai Haehnle <nhaehnle@gmail.com>
Fri, 13 Jun 2008 17:36:02 +0000 (19:36 +0200)
src/mesa/drivers/dri/r300/r300_state.c patch | blob | history

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index b36ca7aef85d84f0b4d0749f4d48b699b6fc7bc4..c3f1cc9e287169bb7aedaefdbb837a65960f0723 100644 (file)
--- 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 +