summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/swrast')
-rw-r--r--src/mesa/swrast/s_aatriangle.c1
-rw-r--r--src/mesa/swrast/s_nvfragprog.c2
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: