summaryrefslogtreecommitdiffstats
path: root/src/mesa/tnl/t_imm_eval.c
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2001-02-20 18:28:52 +0000
committerKeith Whitwell <[email protected]>2001-02-20 18:28:52 +0000
commit4eebc90a174722422daea6352d4e980bc81b4bb2 (patch)
treefd3f4bedaaf568c17d99cd9e028622ffd505a329 /src/mesa/tnl/t_imm_eval.c
parent8bbc71f2eb6a3d7acce6bc1a66a4caea54d3fc8d (diff)
Added GLvector4chan type, removed lots of CHAN_TYPE ifdefs.
Diffstat (limited to 'src/mesa/tnl/t_imm_eval.c')
-rw-r--r--src/mesa/tnl/t_imm_eval.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/src/mesa/tnl/t_imm_eval.c b/src/mesa/tnl/t_imm_eval.c
index a7c5b7db039..1207a9ab158 100644
--- a/src/mesa/tnl/t_imm_eval.c
+++ b/src/mesa/tnl/t_imm_eval.c
@@ -1,4 +1,4 @@
-/* $Id: t_imm_eval.c,v 1.4 2001/01/24 00:04:59 brianp Exp $ */
+/* $Id: t_imm_eval.c,v 1.5 2001/02/20 18:28:52 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -144,14 +144,7 @@ static void eval1_norm( GLvector3f *dest,
}
}
-static void eval1_color(
-#if CHAN_TYPE == GL_UNSIGNED_BYTE
- GLvector4ub *dest,
-#elif CHAN_TYPE == GL_UNSIGNED_SHORT
- GLvector4us *dest,
-#elif CHAN_TYPE == GL_FLOAT
- GLvector4f *dest,
-#endif
+static void eval1_color( GLvector4chan *dest,
GLfloat coord[][4],
const GLuint *flags,
struct gl_1d_map *map )
@@ -283,14 +276,7 @@ static void eval2_1ui( GLvector1ui *dest,
-static void eval2_color(
-#if CHAN_TYPE == GL_UNSIGNED_BYTE
- GLvector4ub *dest,
-#elif CHAN_TYPE == GL_UNSIGNED_SHORT
- GLvector4us *dest,
-#elif CHAN_TYPE == GL_FLOAT
- GLvector4f *dest,
-#endif
+static void eval2_color( GLvector4chan *dest,
GLfloat coord[][4],
GLuint *flags,
struct gl_2d_map *map )