Removed UPDATE_IMAGE_TRANSFER_STATE, use _NEW_PIXEL flag instead.
More minor GLchan changes.
Silence some compiler warnings in cva.[ch]
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 4cd73ef..a7787b6 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -1,4 +1,4 @@
-/* $Id: pixel.c,v 1.17 2000/10/30 13:32:01 keithw Exp $ */
+/* $Id: pixel.c,v 1.18 2000/10/30 16:32:43 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -632,7 +632,6 @@
}
/* signal to recompute the bitmask */
- ctx->ImageTransferState = UPDATE_IMAGE_TRANSFER_STATE;
ctx->NewState |= _NEW_PIXEL;
}
@@ -1063,10 +1062,10 @@
GLuint gmask = ctx->Pixel.MapItoGsize - 1;
GLuint bmask = ctx->Pixel.MapItoBsize - 1;
GLuint amask = ctx->Pixel.MapItoAsize - 1;
- const GLfloat *rMap = ctx->Pixel.MapItoR8;
- const GLfloat *gMap = ctx->Pixel.MapItoG8;
- const GLfloat *bMap = ctx->Pixel.MapItoB8;
- const GLfloat *aMap = ctx->Pixel.MapItoA8;
+ const GLfloat *rMap = ctx->Pixel.MapItoR;
+ const GLfloat *gMap = ctx->Pixel.MapItoG;
+ const GLfloat *bMap = ctx->Pixel.MapItoB;
+ const GLfloat *aMap = ctx->Pixel.MapItoA;
GLuint i;
for (i=0;i<n;i++) {
rgba[i][RCOMP] = FLOAT_TO_CHAN(rMap[index[i] & rmask]);