diff options
| -rw-r--r-- | src/mesa/swrast/s_aatritemp.h | 6 | ||||
| -rw-r--r-- | src/mesa/swrast/s_texture.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/swrast/s_aatritemp.h b/src/mesa/swrast/s_aatritemp.h index d2a866b8a34..2876fbeda8f 100644 --- a/src/mesa/swrast/s_aatritemp.h +++ b/src/mesa/swrast/s_aatritemp.h @@ -1,4 +1,4 @@ -/* $Id: s_aatritemp.h,v 1.16 2001/05/16 20:27:12 brianp Exp $ */ +/* $Id: s_aatritemp.h,v 1.17 2001/05/30 17:44:14 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -65,7 +65,7 @@ #endif #ifdef DO_RGBA GLfloat rPlane[4], gPlane[4], bPlane[4], aPlane[4]; - DEFMARRAY(GLubyte, rgba, MAX_WIDTH, 4); /* mac 32k limitation */ + DEFMARRAY(GLchan, rgba, MAX_WIDTH, 4); /* mac 32k limitation */ #endif #ifdef DO_INDEX GLfloat iPlane[4]; @@ -76,7 +76,7 @@ #endif #ifdef DO_SPEC GLfloat srPlane[4], sgPlane[4], sbPlane[4]; - DEFMARRAY(GLubyte, spec, MAX_WIDTH, 4); + DEFMARRAY(GLchan, spec, MAX_WIDTH, 4); #endif #ifdef DO_TEX GLfloat sPlane[4], tPlane[4], uPlane[4], vPlane[4]; diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c index a5a64d04662..3048f01d5df 100644 --- a/src/mesa/swrast/s_texture.c +++ b/src/mesa/swrast/s_texture.c @@ -1,4 +1,4 @@ -/* $Id: s_texture.c,v 1.30 2001/05/16 20:27:12 brianp Exp $ */ +/* $Id: s_texture.c,v 1.31 2001/05/30 17:47:43 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1748,7 +1748,7 @@ texture_combine(const GLcontext *ctx, GLuint i, j; const GLuint RGBshift = textureUnit->CombineScaleShiftRGB; const GLuint Ashift = textureUnit->CombineScaleShiftA; - DEFMNARRAY(GLubyte, ccolor, 3, 3 * MAX_WIDTH, 4); /* mac 32k limitation */ + DEFMNARRAY(GLchan, ccolor, 3, 3 * MAX_WIDTH, 4); /* mac 32k limitation */ CHECKARRAY(ccolor, return); /* mac 32k limitation */ ASSERT(ctx->Extensions.EXT_texture_env_combine || @@ -1977,8 +1977,8 @@ texture_combine(const GLcontext *ctx, case GL_DOT3_RGB_ARB: case GL_DOT3_RGBA_ARB: { - const GLubyte (*arg0)[4] = (const GLubyte (*)[4]) argRGB[0]; - const GLubyte (*arg1)[4] = (const GLubyte (*)[4]) argRGB[1]; + const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0]; + const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1]; /* ATI's EXT extension has a constant scale by 4. The ARB * one will likely remove this restriction, and we should * drop the EXT extension in favour of the ARB one. @@ -1991,7 +1991,7 @@ texture_combine(const GLcontext *ctx, S_PROD((GLint)arg0[i][BCOMP] - 128, (GLint)arg1[i][BCOMP] - 128)) >> 6; dot = CLAMP(dot, 0, 255); - rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = (GLubyte)dot; + rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = (GLchan) dot; } } break; |