Merge branch 'gallium-noblocks'

Conflicts:
	src/gallium/state_trackers/xorg/xorg_exa.c

diff --cc src/gallium/auxiliary/draw/draw_pipe_aaline.c
Simple merge

diff --cc src/gallium/auxiliary/draw/draw_pipe_pstipple.c
Simple merge

diff --cc src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
Simple merge

diff --cc src/gallium/drivers/r300/r300_screen.c
Simple merge

diff --cc src/gallium/drivers/svga/svga_screen_texture.c
Simple merge

diff --cc src/gallium/include/pipe/p_state.h
Simple merge

diff --cc src/gallium/state_trackers/python/retrace/interpreter.py
Simple merge

diff --cc src/gallium/state_trackers/xorg/xorg_crtc.c
Simple merge

diff --cc src/gallium/state_trackers/xorg/xorg_dri2.c
Simple merge

diff --cc src/gallium/state_trackers/xorg/xorg_exa.c
index aa46cd45f1668ad505c0ba19cdfdd94ffa9236e9,c02ed39ca1cd3154f1449d936d53b4b041317638..55b87aefa15a1a8594159ef4144fdadd3c5b98eb
--- 1/src/gallium/state_trackers/xorg/xorg_exa.c
--- 2/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;

diff --cc src/gallium/state_trackers/xorg/xorg_renderer.c
Simple merge

diff --cc src/gallium/state_trackers/xorg/xorg_xv.c
Simple merge

diff --cc src/gallium/winsys/xlib/xlib_cell.c
Simple merge

diff --cc src/mesa/state_tracker/st_cb_drawpixels.c
Simple merge