Mesa (master): st: Silence compiler warnings.
MichaŠKról
michal at kemper.freedesktop.org
Sat Mar 21 10:47:39 UTC 2009
Module: Mesa
Branch: master
Commit: d7b7b63bd7cca80e99ad9701f8b56ee365053647
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d7b7b63bd7cca80e99ad9701f8b56ee365053647
Author: Michal Krol <michal at vmware.com>
Date: Sat Mar 21 11:46:54 2009 +0100
st: Silence compiler warnings.
---
src/mesa/state_tracker/st_cb_texture.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index edfa885..311d812 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -467,7 +467,7 @@ st_TexImage(GLcontext * ctx,
*/
if (stObj->pt) {
if (stObj->teximage_realloc ||
- level > stObj->pt->last_level ||
+ level > (GLint) stObj->pt->last_level ||
(stObj->pt->last_level == level &&
stObj->pt->target != PIPE_TEXTURE_CUBE &&
!st_texture_match_image(stObj->pt, &stImage->base,
@@ -803,7 +803,6 @@ st_TexSubimage(GLcontext * ctx,
PIPE_TRANSFER_WRITE,
xoffset, yoffset,
width, height);
- dstRowStride = stImage->transfer->stride;
}
if (!texImage->Data) {
@@ -812,6 +811,7 @@ st_TexSubimage(GLcontext * ctx,
}
src = (const GLubyte *) pixels;
+ dstRowStride = stImage->transfer->stride;
for (i = 0; i++ < depth;) {
if (!texImage->TexFormat->StoreImage(ctx, dims, texImage->_BaseFormat,
More information about the mesa-commit
mailing list