diff options
| author | Brian Paul <[email protected]> | 2001-06-05 21:41:05 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2001-06-05 21:41:05 +0000 |
| commit | 470a7b48745d0e467973c9b9d751a8be4abec0e6 (patch) | |
| tree | afc86af1ccd3ae5d9283f3a58900f7b7520f368c | |
| parent | a1164746e7f5b574fa12c1e3c45986243049880d (diff) | |
minor clean-ups
| -rw-r--r-- | src/mesa/swrast/s_aatritemp.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/mesa/swrast/s_aatritemp.h b/src/mesa/swrast/s_aatritemp.h index 2876fbeda8f..0c6a8be3ec2 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.17 2001/05/30 17:44:14 brianp Exp $ */ +/* $Id: s_aatritemp.h,v 1.18 2001/06/05 21:41:05 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -198,7 +198,6 @@ compute_plane(p0, p1, p2, v0->specular[2], v1->specular[2], v2->specular[2],sbPlane); } else { - /* KW: added this */ constant_plane(v2->specular[RCOMP], srPlane); constant_plane(v2->specular[GCOMP], sgPlane); constant_plane(v2->specular[BCOMP], sbPlane); @@ -271,18 +270,18 @@ */ yMin = vMin->win[1]; yMax = vMax->win[1]; - iyMin = (int) yMin; - iyMax = (int) yMax + 1; + iyMin = (GLint) yMin; + iyMax = (GLint) yMax + 1; if (ltor) { /* scan left to right */ - const float *pMin = vMin->win; - const float *pMid = vMid->win; - const float *pMax = vMax->win; - const float dxdy = majDx / majDy; - const float xAdj = dxdy < 0.0F ? -dxdy : 0.0F; - float x = pMin[0] - (yMin - iyMin) * dxdy; - int iy; + const GLfloat *pMin = vMin->win; + const GLfloat *pMid = vMid->win; + const GLfloat *pMax = vMax->win; + const GLfloat dxdy = majDx / majDy; + const GLfloat xAdj = dxdy < 0.0F ? -dxdy : 0.0F; + GLfloat x = pMin[0] - (yMin - iyMin) * dxdy; + GLint iy; for (iy = iyMin; iy < iyMax; iy++, x += dxdy) { GLint ix, startX = (GLint) (x - xAdj); GLuint count, n; |