summaryrefslogtreecommitdiff
path: root/src/mesa/tnl/t_imm_elt.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2001-09-14 21:30:31 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2001-09-14 21:30:31 +0000
commitedf8c06270a0e62f33e3f45e1f0307acfeff3b5d (patch)
tree6da442d6083e6948895479866c884d60392bb7e5 /src/mesa/tnl/t_imm_elt.c
parent7cc49c2dc84ce17a9b4cc1a376da74515a724c92 (diff)
more warning fixes (Karl Schultz)
Diffstat (limited to 'src/mesa/tnl/t_imm_elt.c')
-rw-r--r--src/mesa/tnl/t_imm_elt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/tnl/t_imm_elt.c b/src/mesa/tnl/t_imm_elt.c
index 4a3c25f643..0a891733e9 100644
--- a/src/mesa/tnl/t_imm_elt.c
+++ b/src/mesa/tnl/t_imm_elt.c
@@ -1,4 +1,4 @@
-/* $Id: t_imm_elt.c,v 1.11 2001/05/11 08:11:31 keithw Exp $ */
+/* $Id: t_imm_elt.c,v 1.12 2001/09/14 21:30:31 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -425,12 +425,12 @@ static trans_elt_4f_func _tnl_trans_elt_4f_tab[5][MAX_TYPES];
*/
#define SRC GLdouble
#define SRC_IDX TYPE_IDX(GL_DOUBLE)
-#define TRX_3F(f,n) PTR_ELT(f,n)
-#define TRX_4F(f,n) PTR_ELT(f,n)
+#define TRX_3F(f,n) (GLfloat) PTR_ELT(f,n)
+#define TRX_4F(f,n) (GLfloat) PTR_ELT(f,n)
#define TRX_UB(ub,f,n) UNCLAMPED_FLOAT_TO_UBYTE(ub, PTR_ELT(f,n))
#define TRX_US(us,f,n) UNCLAMPED_FLOAT_TO_USHORT(us, PTR_ELT(f,n))
-#define TRX_UI(f,n) (GLuint) (GLint) PTR_ELT(f,n)
-#define TRX_1F(f,n) PTR_ELT(f,n)
+#define TRX_UI(f,n) (GLuint) (GLint) PTR_ELT(f,n)
+#define TRX_1F(f,n) (GLfloat) PTR_ELT(f,n)
#define SZ 4