summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2004-01-13 02:18:58 +0000
committerIan Romanick <[email protected]>2004-01-13 02:18:58 +0000
commiteba6bacc88461a7d4083cdd1d4799c7d37307a44 (patch)
treeaa47e8395db0d1ce7e49851cd8e12624c2b61336 /src/mesa
parent3d8f7d4c8c9b28272f152aebbaf775bf0d788ab7 (diff)
Removed some dead code. R128 does not (as far as I can tell) support
GL_ARB_texture_border_clamp. The ATI drivers for Windows support it, but I can see no way to make it work without a fallback.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/r128/r128_tex.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/r128/r128_tex.c b/src/mesa/drivers/dri/r128/r128_tex.c
index c5fb0dbffeb..bd8195af480 100644
--- a/src/mesa/drivers/dri/r128/r128_tex.c
+++ b/src/mesa/drivers/dri/r128/r128_tex.c
@@ -57,6 +57,14 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#define TEX_1 2
+/**
+ * Set the texture wrap modes. Currently \c GL_REPEAT, \c GL_CLAMP,
+ * \c GL_CLAMP_TO_EDGE, and \c GL_MIRRORED_REPEAT are supported.
+ *
+ * \param t Texture object whose wrap modes are to be set
+ * \param swrap Wrap mode for the \a s texture coordinate
+ * \param twrap Wrap mode for the \a t texture coordinate
+ */
static void r128SetTexWrap( r128TexObjPtr t, GLenum swrap, GLenum twrap )
{
t->setup.tex_cntl &= ~(R128_TEX_CLAMP_S_MASK | R128_TEX_CLAMP_T_MASK);
@@ -71,9 +79,6 @@ static void r128SetTexWrap( r128TexObjPtr t, GLenum swrap, GLenum twrap )
case GL_REPEAT:
t->setup.tex_cntl |= R128_TEX_CLAMP_S_WRAP;
break;
- case GL_CLAMP_TO_BORDER:
- t->setup.tex_cntl |= R128_TEX_CLAMP_S_BORDER_COLOR;
- break;
case GL_MIRRORED_REPEAT:
t->setup.tex_cntl |= R128_TEX_CLAMP_S_MIRROR;
break;
@@ -89,9 +94,6 @@ static void r128SetTexWrap( r128TexObjPtr t, GLenum swrap, GLenum twrap )
case GL_REPEAT:
t->setup.tex_cntl |= R128_TEX_CLAMP_T_WRAP;
break;
- case GL_CLAMP_TO_BORDER:
- t->setup.tex_cntl |= R128_TEX_CLAMP_T_BORDER_COLOR;
- break;
case GL_MIRRORED_REPEAT:
t->setup.tex_cntl |= R128_TEX_CLAMP_T_MIRROR;
break;
@@ -457,8 +459,8 @@ static void r128DDTexEnv( GLcontext *ctx, GLenum target,
}
break;
- case GL_TEXTURE_LOD_BIAS_EXT:
- do {
+ case GL_TEXTURE_LOD_BIAS:
+ {
CARD32 t = rmesa->setup.tex_cntl_c;
GLint bias;
CARD32 b;
@@ -490,7 +492,7 @@ static void r128DDTexEnv( GLcontext *ctx, GLenum target,
rmesa->setup.tex_cntl_c = t;
rmesa->dirty |= R128_UPLOAD_CONTEXT;
}
- } while (0);
+ }
break;
default: