fix some float/ubyte mistakes (Daniel Borca)

[mesa.git] / src / mesa / drivers / glide / fxtris.c

diff --git a/src/mesa/drivers/glide/fxtris.c b/src/mesa/drivers/glide/fxtris.c
index ef504cccea41d7139eb27ff92ee7ad7667565e54..97327dbef9e2f009413ac9bc6c7abbddc14285da 100644 (file)
--- a/src/mesa/drivers/glide/fxtris.c
+++ b/src/mesa/drivers/glide/fxtris.c
@@ -1,4 +1,4 @@
-/* $Id: fxtris.c,v 1.17 2001/09/23 16:50:01 brianp Exp $ */
+/* $Id: fxtris.c,v 1.21 2002/10/29 20:28:57 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -25,19 +25,13 @@
  */
 
 /* Authors:
- *    Keith Whitwell <keithw@valinux.com>
+ *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#include "conf.h"
-#endif
+#include "glheader.h"
 
 #ifdef FX
 
-#include <stdio.h>
-#include <math.h>
-
-#include "glheader.h"
 #include "mtypes.h"
 #include "macros.h"
 #include "colormac.h"
@@ -214,7 +208,7 @@ fx_fallback_point( fxMesaContext fxMesa,
 
 static void fx_print_vertex( GLcontext *ctx, const GrVertex *v )
 {
-   fprintf(stderr, "vertex at %p\n", v);
+   fprintf(stderr, "vertex at %p\n", (void *) v);
 
    fprintf(stderr, "x %f y %f z %f oow %f\n", 
           v->x, v->y, v->ooz, v->oow);
@@ -331,7 +325,7 @@ do {                                                \
 do {                                           \
    color[idx][0] = v[idx]->r;                  \
    color[idx][1] = v[idx]->g;                  \
-   color[idx][1] = v[idx]->b;                  \
+   color[idx][2] = v[idx]->b;                  \
    color[idx][3] = v[idx]->a;                  \
 } while (0)