Looks like masking masking t->filter isnt needed anymore.

texwrap still shows some problems with clamp mode with nearest filtering.

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index f4dd8bece75660c4e353da23d7ec5cff31f877b2..e939daac249ce7e88f86e425ff97dd1b97693e76 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1161,11 +1161,6 @@ void r300_setup_textures(GLcontext *ctx)
                        max_texture_unit=i;
                        r300->hw.txe.cmd[R300_TXE_ENABLE]|=(1<<i);
                        
-                       /* Turn off rest of the bits that are wrong. Im going to get rid of this soon, dont worry :) */
-                       t->filter &= R300_TX_MIN_FILTER_MASK | R300_TX_MAG_FILTER_MASK
-                                       |R300_TX_WRAP_S_MASK | R300_TX_WRAP_T_MASK |
-                                       R300_TX_WRAP_Q_MASK | R300_TX_MAX_ANISO_MASK;
-                       
                        r300->hw.tex.filter.cmd[R300_TEX_VALUE_0+i]=t->filter;
                        
                        /* No idea why linear filtered textures shake when puting random data */