Clean-up compiler warnings.

This commit is contained in:
Ian Romanick 2006-11-13 23:34:35 +00:00
parent 37ce9b30e9
commit 0b69e4837e
2 changed files with 5 additions and 2 deletions

View File

@ -1755,7 +1755,7 @@ tdfxCompressedTexSubImage2D( GLcontext *ctx, GLenum target,
for (i = 0; i < rows; i++) {
MEMCPY(dest, data, srcRowStride);
dest += destRowStride;
data = (GLvoid *)((GLuint)data + (GLuint)srcRowStride);
data = (GLvoid *)((intptr_t)data + (intptr_t)srcRowStride);
}
/* [dBorca] Hack alert:

View File

@ -1015,9 +1015,12 @@ SetupSingleTexEnvVoodoo3(GLcontext *ctx, int unit,
}
break;
default:
default: {
(void) memcpy(&colorComb, &fxMesa->ColorCombine, sizeof(colorComb));
(void) memcpy(&alphaComb, &fxMesa->AlphaCombine, sizeof(alphaComb));
_mesa_problem(ctx, "bad texture env mode in %s", __FUNCTION__);
}
}
if (colorComb.Function != fxMesa->ColorCombine.Function ||
colorComb.Factor != fxMesa->ColorCombine.Factor ||