summaryrefslogtreecommitdiff
path: root/src/mesa/tnl
diff options
context:
space:
mode:
authorBrian <brian@nostromo.localnet.net>2007-01-23 11:46:02 -0700
committerBrian <brian@nostromo.localnet.net>2007-01-23 11:46:02 -0700
commit18d1fdebebcb52e7fcf50e62c4c02862d173af51 (patch)
tree4b1ebe71f1c6e8a45278fcab30dacd4d859896a6 /src/mesa/tnl
parentd46093b8d56f6d89b341d7437c5185ca6be597af (diff)
fixes for C++ warnings/errors
Diffstat (limited to 'src/mesa/tnl')
-rw-r--r--src/mesa/tnl/t_array_api.c2
-rw-r--r--src/mesa/tnl/t_vb_arbprogram.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_array_api.c b/src/mesa/tnl/t_array_api.c
index 6826cf7e24..087f6af08c 100644
--- a/src/mesa/tnl/t_array_api.c
+++ b/src/mesa/tnl/t_array_api.c
@@ -298,7 +298,7 @@ _tnl_DrawRangeElements(GLenum mode,
#ifdef DEBUG
/* check that array indices really fall inside [start, end] range */
{
- GLuint i;
+ GLint i;
for (i = 0; i < count; i++) {
if (ui_indices[i] < start || ui_indices[i] > end) {
_mesa_warning(ctx, "Invalid array index in "
diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c
index bf4c1d5223..524472a777 100644
--- a/src/mesa/tnl/t_vb_arbprogram.c
+++ b/src/mesa/tnl/t_vb_arbprogram.c
@@ -1056,7 +1056,7 @@ static void compile_vertex_program( struct gl_vertex_program *program,
{
struct compilation cp;
struct tnl_compiled_program *p = CALLOC_STRUCT(tnl_compiled_program);
- GLuint i;
+ GLint i;
if (program->TnlData)
free_tnl_data( program );
@@ -1290,6 +1290,7 @@ run_arb_vertex_program(GLcontext *ctx, struct tnl_pipeline_stage *stage)
call_func( p, m );
}
else {
+ GLint j;
for (j = 0; j < p->nr_instructions; j++) {
union instruction inst = p->instructions[j];
opcode_func[inst.alu.opcode]( m, inst );