diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-03-08 15:23:46 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-03-08 15:23:46 +0000 |
| commit | 01915e90e6912f06d43d443a09157f7bbc96ddc5 (patch) | |
| tree | fc86ff76a45027c01d45902bed894d12f161088c /src/mesa/swrast_setup/ss_vbtmp.h | |
| parent | eac57f009ea347cfce0d70452c1bdeb0e6c9eeae (diff) | |
| download | external_mesa3d-01915e90e6912f06d43d443a09157f7bbc96ddc5.zip external_mesa3d-01915e90e6912f06d43d443a09157f7bbc96ddc5.tar.gz external_mesa3d-01915e90e6912f06d43d443a09157f7bbc96ddc5.tar.bz2 | |
More g++ warning fixes. Fixes for CHAN_BITS==16, it seems to work.
Diffstat (limited to 'src/mesa/swrast_setup/ss_vbtmp.h')
| -rw-r--r-- | src/mesa/swrast_setup/ss_vbtmp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/swrast_setup/ss_vbtmp.h b/src/mesa/swrast_setup/ss_vbtmp.h index 6197f5b..8b6aaae 100644 --- a/src/mesa/swrast_setup/ss_vbtmp.h +++ b/src/mesa/swrast_setup/ss_vbtmp.h @@ -39,7 +39,7 @@ static void TAG(rs)(GLcontext *ctx, GLuint start, GLuint end, GLuint newinputs ) GLfloat *fog; GLfloat *pointSize; GLuint tsz[MAX_TEXTURE_UNITS]; - int i; + GLuint i; GLfloat *m = ctx->Viewport._WindowMap.m; const GLfloat sx = m[0]; const GLfloat sy = m[5]; @@ -118,10 +118,10 @@ static void TAG(rs)(GLcontext *ctx, GLuint start, GLuint end, GLuint newinputs ) } if (IND & COLOR) - COPY_4UBV(v->color, color[i]); + COPY_CHAN4(v->color, color[i]); if (IND & SPEC) - COPY_4UBV(v->specular, spec[i]); + COPY_CHAN4(v->specular, spec[i]); if (IND & FOG) v->fog = fog[i]; |