aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-16 08:40:57 +0200
committermarha <marha@users.sourceforge.net>2011-09-16 08:40:57 +0200
commit9d911bc1246139019e555f443e934677a067bc0a (patch)
tree2af1428f59f88fbcbe4e0ed27a29ff9f3426210a /mesalib/src/mesa/state_tracker
parent4095d7af9f50126361eb7b0aeba6869786f63d5c (diff)
parent18ae1470a8dbcfe369ddf0d7e17e0ea665251ccd (diff)
downloadvcxsrv-9d911bc1246139019e555f443e934677a067bc0a.tar.gz
vcxsrv-9d911bc1246139019e555f443e934677a067bc0a.tar.bz2
vcxsrv-9d911bc1246139019e555f443e934677a067bc0a.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
-rw-r--r--mesalib/src/mesa/state_tracker/st_cb_texture.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c
index e4be7fba4..eab02fb3b 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c
@@ -1829,9 +1829,10 @@ st_finalize_texture(struct gl_context *ctx,
/* Need to import images in main memory or held in other textures.
*/
if (stImage && stObj->pt != stImage->pt) {
- if (level == 0 || (stImage->base.Width == u_minify(stObj->width0, level) &&
- stImage->base.Height == u_minify(stObj->height0, level) &&
- stImage->base.Depth == u_minify(stObj->depth0, level))) {
+ if (level == 0 ||
+ (stImage->base.Width == u_minify(stObj->width0, level) &&
+ stImage->base.Height == u_minify(stObj->height0, level) &&
+ stImage->base.Depth == u_minify(stObj->depth0, level))) {
/* src image fits expected dest mipmap level size */
copy_image_data_to_texture(st, stObj, level, stImage);
}