diff options
author | marha <marha@users.sourceforge.net> | 2013-06-28 16:47:15 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-06-28 16:47:15 +0200 |
commit | ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c (patch) | |
tree | 24d79f7eaee4d69dde46cf88aa7314a4fceebbe5 /mesalib/src/mesa/state_tracker/st_gen_mipmap.c | |
parent | 2fe2056807d1304de86deb2b59992d51d9252ad0 (diff) | |
download | vcxsrv-ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c.tar.gz vcxsrv-ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c.tar.bz2 vcxsrv-ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c.zip |
fontconfig mesa git update 28 June 2013
fontconfig commit 197d06c49b01413303f2c92130594daa4fcaa6ad
mesa commit 24b05ff1581b612ab6dbf4937fa4b644b4e61379
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_gen_mipmap.c')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_gen_mipmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c index e5512af2a..d01a21ebf 100644 --- a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c +++ b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c @@ -118,7 +118,7 @@ compute_num_levels(struct gl_context *ctx, baseImage = _mesa_get_tex_image(ctx, texObj, target, texObj->BaseLevel); numLevels = texObj->BaseLevel + baseImage->MaxNumLevels; - numLevels = MIN2(numLevels, texObj->MaxLevel + 1); + numLevels = MIN2(numLevels, (GLuint) texObj->MaxLevel + 1); assert(numLevels >= 1); return numLevels; |