From: Roland Scheidegger <sroland@vmware.com>
Date: Thu, 3 Dec 2009 23:35:14 +0000 (+0100)
Subject: Merge branch 'gallium-noblocks'
X-Git-Tag: 062012170305~15666
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c6a9363ef96c00dd0ad63e340b32479e43fea45;p=profile%2Fivi%2Fmesa.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 aa46cd4,c02ed39..55b87ae
--- 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;