From 18ae1470a8dbcfe369ddf0d7e17e0ea665251ccd Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 16 Sep 2011 08:36:51 +0200 Subject: git update libXext libXdmcp mesa xkeyboard-config 16 sep 2011 X11/extensions: removed files that are in multiple extension modules --- mesalib/src/mesa/state_tracker/st_cb_texture.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'mesalib/src/mesa/state_tracker') 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); } -- cgit v1.2.3