diff options
| author | Brian Paul <[email protected]> | 1999-11-08 15:28:08 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 1999-11-08 15:28:08 +0000 |
| commit | 99f16d01dd508ccac9d37488bf83a7aed5c05832 (patch) | |
| tree | 27f8875a375f92a39d82ac822a92894cdcc21db4 /src/mesa/main/stencil.c | |
| parent | 19f90e35ff1419169a2d3522e55e4de05b7ab14c (diff) | |
changes to silence MSVC warnings
Diffstat (limited to 'src/mesa/main/stencil.c')
| -rw-r--r-- | src/mesa/main/stencil.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c index 1a05ab2ccab..4510d7f4fcf 100644 --- a/src/mesa/main/stencil.c +++ b/src/mesa/main/stencil.c @@ -1,4 +1,4 @@ -/* $Id: stencil.c,v 1.7 1999/11/05 06:43:10 brianp Exp $ */ +/* $Id: stencil.c,v 1.8 1999/11/08 15:28:08 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -42,9 +42,6 @@ #include "stencil.h" #include "types.h" #include "enable.h" -#ifdef XFree86Server -#include "GL/xf86glx.h" -#endif #endif @@ -340,7 +337,7 @@ static void apply_stencil_op_to_span( GLcontext *ctx, for (i=0;i<n;i++) { if (mask[i]) { GLstencil s = stencil[i]; - stencil[i] = ~s; + stencil[i] = (GLstencil) ~s; } } } @@ -500,7 +497,7 @@ GLint gl_stencil_span( GLcontext *ctx, } break; case GL_NOTEQUAL: - r = ctx->Stencil.Ref & ctx->Stencil.ValueMask; + r = (GLstencil) (ctx->Stencil.Ref & ctx->Stencil.ValueMask); for (i=0;i<n;i++) { if (mask[i]) { s = (GLstencil) (stencil[i] & ctx->Stencil.ValueMask); |