summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorDave Airlie <airliedfreedesktop.org>2005-10-20 06:06:18 +0000
committerDave Airlie <airliedfreedesktop.org>2005-10-20 06:06:18 +0000
commit806e25a5d9c92d3b8e13d8ba3bc90fd3094803f3 (patch)
tree4cd5f35ff67f4162106372dd73d4c2b8e0bd0a36 /src/mesa
parent301c3dcb6cbbbf29e05e2b8497d676ccee75368f (diff)
fixes for r300_tex.c from Aapo Tahkola
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/r300/r300_tex.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_tex.c b/src/mesa/drivers/dri/r300/r300_tex.c
index 44368c2819..73d16270e3 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;