diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-11-25 16:39:31 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-11-25 16:39:31 +0000 |
| commit | 8236a534b7c31b5d3b688323de05cfa5e446f70d (patch) | |
| tree | f2da1c9f02675aeced8c0020bd8a38bdd621f2e7 /src/mesa/main | |
| parent | 2c9f50dd4acc65ddfeb8e3fde98137711167e579 (diff) | |
fix assorted g++ warnings
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/program.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/program.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/main/program.c b/src/mesa/main/program.c index 546c054003..9a081ece20 100644 --- a/src/mesa/main/program.c +++ b/src/mesa/main/program.c @@ -345,7 +345,7 @@ _mesa_add_state_reference(struct program_parameter_list *paramList, idx = add_parameter(paramList, "Some State", NULL, STATE); for (a=0; a<6; a++) - paramList->Parameters[idx].StateIndexes[a] = stateTokens[a]; + paramList->Parameters[idx].StateIndexes[a] = (enum state_index) stateTokens[a]; return idx; } diff --git a/src/mesa/main/program.h b/src/mesa/main/program.h index 23807746a6..3c2aa1cdac 100644 --- a/src/mesa/main/program.h +++ b/src/mesa/main/program.h @@ -116,15 +116,15 @@ enum state_index { STATE_TEXGEN_OBJECT_R, STATE_TEXGEN_OBJECT_Q, - STATE_TEXENV_COLOR, + STATE_TEXENV_COLOR, - STATE_DEPTH_RANGE, + STATE_DEPTH_RANGE, - STATE_VERTEX_PROGRAM, - STATE_FRAGMENT_PROGRAM, + STATE_VERTEX_PROGRAM, + STATE_FRAGMENT_PROGRAM, - STATE_ENV, - STATE_LOCAL + STATE_ENV, + STATE_LOCAL }; |