From 01915e90e6912f06d43d443a09157f7bbc96ddc5 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 8 Mar 2001 15:23:46 +0000
Subject: More g++ warning fixes.  Fixes for CHAN_BITS==16, it seems to work.

---
 src/mesa/tnl/t_imm_elt.c  | 4 ++--
 src/mesa/tnl/t_imm_exec.c | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/mesa/tnl')

diff --git a/src/mesa/tnl/t_imm_elt.c b/src/mesa/tnl/t_imm_elt.c
index 497790d888..6fe8f9aa14 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.4 2001/02/20 18:28:52 keithw Exp $ */
+/* $Id: t_imm_elt.c,v 1.5 2001/03/08 15:23:47 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -705,7 +705,7 @@ static void _tnl_trans_elt_4f(GLfloat (*to)[4],
 					
 }
 
-static void _tnl_trans_elt_4chan(GLubyte (*to)[4],
+static void _tnl_trans_elt_4chan(GLchan (*to)[4],
                                const struct gl_client_array *from,
                                GLuint *flags,
                                GLuint *elts,
diff --git a/src/mesa/tnl/t_imm_exec.c b/src/mesa/tnl/t_imm_exec.c
index 5de0652168..ff8cc00989 100644
--- a/src/mesa/tnl/t_imm_exec.c
+++ b/src/mesa/tnl/t_imm_exec.c
@@ -1,4 +1,4 @@
-/* $Id: t_imm_exec.c,v 1.14 2001/03/03 20:33:31 brianp Exp $ */
+/* $Id: t_imm_exec.c,v 1.15 2001/03/08 15:23:47 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -29,6 +29,7 @@
 
 
 #include "glheader.h"
+#include "colormac.h"
 #include "context.h"
 #include "enums.h"
 #include "dlist.h"
@@ -104,7 +105,7 @@ void _tnl_copy_to_current( GLcontext *ctx, struct immediate *IM,
       ctx->Current.EdgeFlag = IM->EdgeFlag[count];
 
    if (flag & VERT_RGBA) {
-      COPY_4UBV(ctx->Current.Color, IM->Color[count]);
+      COPY_CHAN4(ctx->Current.Color, IM->Color[count]);
       if (ctx->Light.ColorMaterialEnabled) {
 	 _mesa_update_color_material( ctx, ctx->Current.Color );
 	 _mesa_validate_all_lighting_tables( ctx );
@@ -112,7 +113,7 @@ void _tnl_copy_to_current( GLcontext *ctx, struct immediate *IM,
    }
 
    if (flag & VERT_SPEC_RGB)
-      COPY_4UBV(ctx->Current.SecondaryColor, IM->SecondaryColor[count]);
+      COPY_CHAN4(ctx->Current.SecondaryColor, IM->SecondaryColor[count]);
 
    if (flag & VERT_FOG_COORD)
       ctx->Current.FogCoord = IM->FogCoord[count];
-- 
cgit v1.2.3