From: Aapo Tahkola <aet@rasterburn.org>
Date: Sun, 16 Jan 2005 17:07:24 +0000 (+0000)
Subject: This fixes it but why mipmaps still work?
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=14aea4a485346ad8241cc3285ac76b7f5a8e70e0;p=mesa.git

This fixes it but why mipmaps still work?
It doesnt look like filter constants in r300_reg.h would define number of
levels.
---

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index ea0c37bbe39..cc6328b2401 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1160,9 +1160,6 @@ void r300_setup_textures(GLcontext *ctx)
 				fprintf(stderr, "Activating texture unit %d\n", i);
 			max_texture_unit=i;
 			r300->hw.txe.cmd[R300_TXE_ENABLE]|=(1<<i);
-			
-			t->filter &= R300_TX_MAG_FILTER_MASK | R300_TX_MIN_FILTER_MASK | R300_TX_MAX_ANISO_MASK
-					| R300_TX_WRAP_S_MASK | R300_TX_WRAP_T_MASK  | R300_TX_WRAP_Q_MASK;
 					
 			r300->hw.tex.filter.cmd[R300_TEX_VALUE_0+i]=t->filter;
 			
diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
index 3c6595f4acd..c7b5e7d2a98 100644
--- a/src/mesa/drivers/dri/r300/r300_texstate.c
+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
@@ -152,7 +152,7 @@ static void r300SetTexImages(r300ContextPtr rmesa,
 	if (VALID_FORMAT(baseImage->TexFormat->MesaFormat)) {
 		t->format =
 		    tx_table[baseImage->TexFormat->MesaFormat].format;
-#if 1	
+#if 1
 		t->filter |=
 		    tx_table[baseImage->TexFormat->MesaFormat].filter;
 #endif		
@@ -270,7 +270,7 @@ static void r300SetTexImages(r300ContextPtr rmesa,
 
 	/* Hardware state:
 	 */
-#if 1	
+#if 0
 	t->filter &= ~R200_MAX_MIP_LEVEL_MASK;
 	t->filter |= (numLevels - 1) << R200_MAX_MIP_LEVEL_SHIFT;
 #endif