diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-05-07 17:06:49 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-05-07 17:06:49 +0000 |
| commit | 6f3d16c64aee2ef0eb94aa0e4ab1ce53fd4a5579 (patch) | |
| tree | 967bda38ba36c242b9304e22b8538b22acaddaa5 /src/mesa/main/texcompress_fxt1.c | |
| parent | 42fa81275c67d7d1ad8d255120af0ffeeb46b963 (diff) | |
assorted warning clean-ups for x86_64, etc (Mikko T.)
Diffstat (limited to 'src/mesa/main/texcompress_fxt1.c')
| -rw-r--r-- | src/mesa/main/texcompress_fxt1.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c index b59b7f1c50..d5e2c790f6 100644 --- a/src/mesa/main/texcompress_fxt1.c +++ b/src/mesa/main/texcompress_fxt1.c @@ -932,7 +932,7 @@ fxt1_quantize_HI (GLuint *cc, /* add in texels */ for (k = N_TEXELS - 1; k >= 0; k--) { GLint t = k * 3; - GLuint *kk = (GLuint *)((GLuint)cc + t / 8); + GLuint *kk = (GLuint *)((char *)cc + t / 8); GLint texel = n_vect + 1; /* transparent black */ if (!ISTBLACK(input[k])) { @@ -1011,7 +1011,7 @@ fxt1_quantize_MIXED1 (GLuint *cc, /* left microtile */ if (maxColL == -1) { /* all transparent black */ - cc[0] = ~0ul; + cc[0] = ~0u; for (i = 0; i < n_comp; i++) { vec[0][i] = 0; vec[1][i] = 0; @@ -1045,7 +1045,7 @@ fxt1_quantize_MIXED1 (GLuint *cc, /* right microtile */ if (maxColR == -1) { /* all transparent black */ - cc[1] = ~0ul; + cc[1] = ~0u; for (i = 0; i < n_comp; i++) { vec[2][i] = 0; vec[3][i] = 0; @@ -1332,7 +1332,7 @@ fxt1_quantize (GLuint *cc, const GLubyte *lines[], GLint comps) if (trualpha) { fxt1_quantize_ALPHA1(cc, input); } else if (l == 0) { - cc[0] = cc[1] = cc[2] = ~0ul; + cc[0] = cc[1] = cc[2] = ~0u; cc[3] = 0; } else if (l < N_TEXELS) { fxt1_quantize_MIXED1(cc, input); |