diff options
| author | Brian Paul <[email protected]> | 2003-09-19 15:38:15 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2003-09-19 15:38:15 +0000 |
| commit | e4fcea2e06571b71a85b4f100c95d866a82f7c19 (patch) | |
| tree | df95d1d9eed897c1dd2fee2923163843ddca3228 /src/mesa/swrast | |
| parent | 74c33393b4ebcc1616c0d8f1b6f43d658aed3f22 (diff) | |
Assorted casts to silence g++ warnings.
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_aatriangle.c | 1 | ||||
| -rw-r--r-- | src/mesa/swrast/s_nvfragprog.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_aatriangle.c b/src/mesa/swrast/s_aatriangle.c index 4f2af74dbf7..b05a7ea28d2 100644 --- a/src/mesa/swrast/s_aatriangle.c +++ b/src/mesa/swrast/s_aatriangle.c @@ -31,6 +31,7 @@ #include "glheader.h" #include "context.h" #include "colormac.h" +#include "context.h" #include "macros.h" #include "imports.h" #include "s_aatriangle.h" diff --git a/src/mesa/swrast/s_nvfragprog.c b/src/mesa/swrast/s_nvfragprog.c index c0c097a8d70..332edc5c86e 100644 --- a/src/mesa/swrast/s_nvfragprog.c +++ b/src/mesa/swrast/s_nvfragprog.c @@ -121,7 +121,7 @@ get_register_pointer( GLcontext *ctx, src = ctx->FragmentProgram.Parameters[source->Index]; break; case PROGRAM_NAMED_PARAM: - ASSERT(source->Index < program->Parameters->NumParameters); + ASSERT(source->Index < (GLint) program->Parameters->NumParameters); src = program->Parameters->Parameters[source->Index].Values; break; case PROGRAM_STATE_VAR: |