diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-13 19:17:13 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-13 19:17:13 +0000 |
| commit | 13abf91b42b00c7eb64c373aff3a4c1bb3d8fb7f (patch) | |
| tree | 2feb39f808660ac82a768c1799d2ddbbd6f3eff1 /src/mesa/main/texenvprogram.c | |
| parent | ad38681a00fc13449b76c2bf1fde0d31b0f9aec8 (diff) | |
casts to fix some -pedantic warnings
Diffstat (limited to 'src/mesa/main/texenvprogram.c')
| -rw-r--r-- | src/mesa/main/texenvprogram.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c index 02ff833dab..520ea02b61 100644 --- a/src/mesa/main/texenvprogram.c +++ b/src/mesa/main/texenvprogram.c @@ -259,7 +259,7 @@ struct ureg { GLuint pad:5; }; -const static struct ureg undef = { +static const struct ureg undef = { ~0, ~0, 0, @@ -342,7 +342,7 @@ static GLboolean is_undef( struct ureg reg ) static struct ureg get_temp( struct texenv_fragment_program *p ) { - int bit; + GLint bit; /* First try and reuse temps which have been used already: */ @@ -358,7 +358,7 @@ static struct ureg get_temp( struct texenv_fragment_program *p ) _mesa_exit(1); } - if (bit > p->program->Base.NumTemporaries) + if ((GLuint) bit > p->program->Base.NumTemporaries) p->program->Base.NumTemporaries = bit; p->temp_in_use |= 1<<(bit-1); @@ -386,7 +386,7 @@ static struct ureg get_tex_temp( struct texenv_fragment_program *p ) _mesa_exit(1); } - if (bit > p->program->Base.NumTemporaries) + if ((GLuint) bit > p->program->Base.NumTemporaries) p->program->Base.NumTemporaries = bit; p->temp_in_use |= 1<<(bit-1); |