xf86-video-ati: Branch 'master'

[Michel Dänzer]

On Mon, 2009-08-31 at 22:24 -0700, Dave Airlie wrote: 
> 
> commit 22fbd6476f4b3513378e848affc4dd269e9d4498
> Author: Dave Airlie <airlied at itt42.(none)>
> Date:   Tue Sep 1 15:22:57 2009 +1000
> 
>     r100/r200: seriously WRAP is illegal for rectangular textures
>     
>     unless we scale all the bos up to POT
> 
> diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
> index 69d8140..c3beadc 100644
> --- a/src/radeon_exa_render.c
> +++ b/src/radeon_exa_render.c
> @@ -415,7 +415,10 @@ static Bool FUNC_NAME(R100TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
>  
>      switch (repeatType) {
>  	case RepeatNormal:
> -	    txfilter |= RADEON_CLAMP_S_WRAP | RADEON_CLAMP_T_WRAP;
> +	    if (txformat & RADEON_TXFORMAT_NON_POWER2)
> +		txfilter |= RADEON_CLAMP_S_CLAMP_LAST | RADEON_CLAMP_T_CLAMP_LAST;
> +	    else
> +	        txfilter |= RADEON_CLAMP_S_WRAP | RADEON_CLAMP_T_WRAP;

This code doesn't make much sense as is - such a condition should have
been caught earlier. Maybe R[12]00TextureSetup need the same code as
R300TextureSetup for info->accel_state->need_src_tile_[xy] or something
like that.


-- 
Earthling Michel Dänzer           |                http://www.vmware.com
Libre software enthusiast         |          Debian, X and DRI developer