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/s_texture.c | |
| parent | eac57f009ea347cfce0d70452c1bdeb0e6c9eeae (diff) | |
More g++ warning fixes. Fixes for CHAN_BITS==16, it seems to work.
Diffstat (limited to 'src/mesa/swrast/s_texture.c')
| -rw-r--r-- | src/mesa/swrast/s_texture.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c index 7b1b4e94e3..3a0da6e253 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.14 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: s_texture.c,v 1.15 2001/03/08 15:23:46 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -76,7 +76,7 @@ if (wrapMode == GL_CLAMP_TO_EDGE) { \ if (I0 < 0) \ I0 = 0; \ - if (I1 >= SIZE) \ + if (I1 >= (GLint) SIZE) \ I1 = SIZE - 1; \ } \ } \ @@ -2441,10 +2441,10 @@ sample_depth_texture(const GLcontext *ctx, j1 += texImage->Border; } else { - if (i0 < 0 || i0 >= width) useBorderTexel |= I0BIT; - if (i1 < 0 || i1 >= width) useBorderTexel |= I1BIT; - if (j0 < 0 || j0 >= height) useBorderTexel |= J0BIT; - if (j1 < 0 || j1 >= height) useBorderTexel |= J1BIT; + if (i0 < 0 || i0 >= (GLint) width) useBorderTexel |= I0BIT; + if (i1 < 0 || i1 >= (GLint) width) useBorderTexel |= I1BIT; + if (j0 < 0 || j0 >= (GLint) height) useBorderTexel |= J0BIT; + if (j1 < 0 || j1 >= (GLint) height) useBorderTexel |= J1BIT; } /* get four depth samples from the texture */ |