diff options
| author | Brian Paul <[email protected]> | 2003-11-25 16:39:31 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2003-11-25 16:39:31 +0000 |
| commit | 8236a534b7c31b5d3b688323de05cfa5e446f70d (patch) | |
| tree | f2da1c9f02675aeced8c0020bd8a38bdd621f2e7 /src/mesa/swrast_setup | |
| parent | 2c9f50dd4acc65ddfeb8e3fde98137711167e579 (diff) | |
fix assorted g++ warnings
Diffstat (limited to 'src/mesa/swrast_setup')
| -rw-r--r-- | src/mesa/swrast_setup/ss_tritmp.h | 12 | ||||
| -rw-r--r-- | src/mesa/swrast_setup/ss_vbtmp.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/swrast_setup/ss_tritmp.h b/src/mesa/swrast_setup/ss_tritmp.h index 85234ce73e1..f977d7aca94 100644 --- a/src/mesa/swrast_setup/ss_tritmp.h +++ b/src/mesa/swrast_setup/ss_tritmp.h @@ -74,9 +74,9 @@ static void TAG(triangle)(GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 ) } } else { GLfloat *vbindex = (GLfloat *)VB->IndexPtr[1]->data; - SS_IND(v[0]->index, vbindex[e0]); - SS_IND(v[1]->index, vbindex[e1]); - SS_IND(v[2]->index, vbindex[e2]); + SS_IND(v[0]->index, (GLuint) vbindex[e0]); + SS_IND(v[1]->index, (GLuint) vbindex[e1]); + SS_IND(v[2]->index, (GLuint) vbindex[e2]); } } } @@ -149,9 +149,9 @@ static void TAG(triangle)(GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 ) } } else { GLfloat *vbindex = (GLfloat *)VB->IndexPtr[0]->data; - SS_IND(v[0]->index, vbindex[e0]); - SS_IND(v[1]->index, vbindex[e1]); - SS_IND(v[2]->index, vbindex[e2]); + SS_IND(v[0]->index, (GLuint) vbindex[e0]); + SS_IND(v[1]->index, (GLuint) vbindex[e1]); + SS_IND(v[2]->index, (GLuint) vbindex[e2]); } } } diff --git a/src/mesa/swrast_setup/ss_vbtmp.h b/src/mesa/swrast_setup/ss_vbtmp.h index 61956f25cee..d72a6693d65 100644 --- a/src/mesa/swrast_setup/ss_vbtmp.h +++ b/src/mesa/swrast_setup/ss_vbtmp.h @@ -137,7 +137,7 @@ static void TAG(emit)(GLcontext *ctx, GLuint start, GLuint end, } if (IND & INDEX) { - v->index = index[0]; + v->index = (GLuint) index[0]; STRIDE_F(index, index_stride); } |