summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/attrib.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2001-05-03 14:11:18 +0000
committerBrian Paul <[email protected]>2001-05-03 14:11:18 +0000
commit9e351d52ae52927fbe505e8808e70de3e646be79 (patch)
tree1317296db672779563ce132da8f98177ac0747db /src/mesa/main/attrib.c
parent5028216c81706070fab906f4e56a14c1e2d61cbc (diff)
minor clean-ups and warning fixes
Diffstat (limited to 'src/mesa/main/attrib.c')
-rw-r--r--src/mesa/main/attrib.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 0acb2a95975..772e304d09b 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1,4 +1,4 @@
-/* $Id: attrib.c,v 1.49 2001/04/17 21:25:53 brianp Exp $ */
+/* $Id: attrib.c,v 1.50 2001/05/03 14:11:18 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -672,7 +672,7 @@ pop_texture_group(GLcontext *ctx, const struct gl_texture_attrib *texAttrib)
bordColor[2] = CHAN_TO_FLOAT(obj->BorderColor[2]);
bordColor[3] = CHAN_TO_FLOAT(obj->BorderColor[3]);
- _mesa_TexParameteri(target, GL_TEXTURE_PRIORITY, obj->Priority);
+ _mesa_TexParameterf(target, GL_TEXTURE_PRIORITY, obj->Priority);
_mesa_TexParameterfv(target, GL_TEXTURE_BORDER_COLOR, bordColor);
_mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, obj->WrapS);
_mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, obj->WrapT);
@@ -694,7 +694,7 @@ pop_texture_group(GLcontext *ctx, const struct gl_texture_attrib *texAttrib)
obj->CompareOperator);
}
if (ctx->Extensions.SGIX_shadow_ambient) {
- _mesa_TexParameteri(target, GL_SHADOW_AMBIENT_SGIX,
+ _mesa_TexParameterf(target, GL_SHADOW_AMBIENT_SGIX,
CHAN_TO_FLOAT(obj->ShadowAmbient));
}