summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Kuehling <[email protected]>2004-12-15 16:59:58 +0000
committerFelix Kuehling <[email protected]>2004-12-15 16:59:58 +0000
commit5566127701df5c97aca94dd99b066f94943ea969 (patch)
treecc862a0298f3f4d241d744469aee83b0e0f9dc98
parente9fbc23024bb831ae781060c414b7906cdfa6d34 (diff)
Fixed GL_CLAM_TO_EDGE. It's not supported in hardware. Use GL_CLAMP
instead of GL_REPEAT.
-rw-r--r--src/mesa/drivers/dri/savage/savagetex.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/savage/savagetex.c b/src/mesa/drivers/dri/savage/savagetex.c
index 9c5b376d71a..edb016f1523 100644
--- a/src/mesa/drivers/dri/savage/savagetex.c
+++ b/src/mesa/drivers/dri/savage/savagetex.c
@@ -1020,8 +1020,10 @@ static void savageUpdateTex0State_s4( GLcontext *ctx )
break;
}
- imesa->regs.s4.texCtrl[0].ni.uMode = !(t->texParams.sWrapMode & 0x01);
- imesa->regs.s4.texCtrl[0].ni.vMode = !(t->texParams.tWrapMode & 0x01);
+ imesa->regs.s4.texCtrl[0].ni.uMode =
+ t->texParams.sWrapMode == GL_REPEAT ? 0 : 1;
+ imesa->regs.s4.texCtrl[0].ni.vMode =
+ t->texParams.tWrapMode == GL_REPEAT ? 0 : 1;
switch (t->texParams.minFilter)
{
@@ -1222,8 +1224,10 @@ static void savageUpdateTex1State_s4( GLcontext *ctx )
break;
}
- imesa->regs.s4.texCtrl[1].ni.uMode = !(t->texParams.sWrapMode & 0x01);
- imesa->regs.s4.texCtrl[1].ni.vMode = !(t->texParams.tWrapMode & 0x01);
+ imesa->regs.s4.texCtrl[1].ni.uMode =
+ t->texParams.sWrapMode == GL_REPEAT ? 0 : 1;
+ imesa->regs.s4.texCtrl[1].ni.vMode =
+ t->texParams.tWrapMode == GL_REPEAT ? 0 : 1;
switch (t->texParams.minFilter)
{