From: Dave Airlie <airliedfreedesktop.org>
Date: Thu, 20 Oct 2005 06:06:18 +0000 (+0000)
Subject: fixes for r300_tex.c from Aapo Tahkola
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=806e25a5d9c92d3b8e13d8ba3bc90fd3094803f3;p=mesa.git

fixes for r300_tex.c from Aapo Tahkola
---

diff --git a/src/mesa/drivers/dri/r300/r300_tex.c b/src/mesa/drivers/dri/r300/r300_tex.c
index 44368c28196..73d16270e32 100644
--- a/src/mesa/drivers/dri/r300/r300_tex.c
+++ b/src/mesa/drivers/dri/r300/r300_tex.c
@@ -220,10 +220,10 @@ static void r300SetTexFilter(r300TexObjPtr t, GLenum minf, GLenum magf)
 			t->filter |= R300_TX_MIN_FILTER_NEAREST_MIP_NEAREST;
 			break;
 		case GL_NEAREST_MIPMAP_LINEAR:
-			t->filter |= R300_TX_MIN_FILTER_LINEAR_MIP_NEAREST;
+			t->filter |= R300_TX_MIN_FILTER_NEAREST_MIP_LINEAR;
 			break;
 		case GL_LINEAR_MIPMAP_NEAREST:
-			t->filter |= R300_TX_MIN_FILTER_NEAREST_MIP_LINEAR;
+			t->filter |= R300_TX_MIN_FILTER_LINEAR_MIP_NEAREST;
 			break;
 		case GL_LINEAR_MIPMAP_LINEAR:
 			t->filter |= R300_TX_MIN_FILTER_LINEAR_MIP_LINEAR;
@@ -951,9 +951,9 @@ static void r300TexEnv(GLcontext * ctx, GLenum target,
 				R200_STATECHANGE(rmesa, tf);
 				rmesa->hw.tf.cmd[TF_TFACTOR_0 + unit] =
 				    envColor;
-			}
+			}*/
 			break;
-		*/}
+		}
 
 	case GL_TEXTURE_LOD_BIAS_EXT:{
 			GLfloat bias, min;