From: Roland Scheidegger Date: Thu, 3 Dec 2009 23:35:14 +0000 (+0100) Subject: Merge branch 'gallium-noblocks' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9c6a9363ef96c00dd0ad63e340b32479e43fea45;p=mesa.git Merge branch 'gallium-noblocks' Conflicts: src/gallium/state_trackers/xorg/xorg_exa.c --- 9c6a9363ef96c00dd0ad63e340b32479e43fea45 diff --cc src/gallium/state_trackers/xorg/xorg_exa.c index aa46cd45f16,c02ed39ca1c..55b87aefa15 --- a/src/gallium/state_trackers/xorg/xorg_exa.c +++ b/src/gallium/state_trackers/xorg/xorg_exa.c @@@ -899,16 -761,8 +899,15 @@@ ExaModifyPixmapHeader(PixmapPtr pPixmap memset(&template, 0, sizeof(template)); template.target = PIPE_TEXTURE_2D; exa_get_pipe_format(depth, &template.format, &bitsPerPixel, &priv->picture_format); - pf_get_block(template.format, &template.block); - template.width0 = width; - template.height0 = height; + if (ROUND_UP_TEXTURES && priv->flags == 0) { + template.width0 = util_next_power_of_two(width); + template.height0 = util_next_power_of_two(height); + } + else { + template.width0 = width; + template.height0 = height; + } + template.depth0 = 1; template.last_level = 0; template.tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET | priv->flags;