xserver: Branch 'master'

[Michel Dänzer]

On Tue, 2008-08-19 at 14:25 -0700, Maarten Maathuis wrote:
> exa/exa_glyphs.c |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> New commits:
> commit bc4cef1d0ae7cbb8f5fe16d576db45abd4330370
> Author: Maarten Maathuis <madman2003 at gmail.com>
> Date:   Mon Aug 18 16:28:33 2008 +0200
> 
>     exa: remove useless cache{X,Y}off from UploadToScreen() arguments.
> 
> diff --git a/exa/exa_glyphs.c b/exa/exa_glyphs.c
> index ff665d5..59ef394 100644
> --- a/exa/exa_glyphs.c
> +++ b/exa/exa_glyphs.c
> @@ -389,9 +389,10 @@ exaGlyphCacheUploadGlyph(ScreenPtr         pScreen,
>      if (!pCachePixmap)
>  	return FALSE;
>  
> +    /* CACHE_{X,Y} are in pixmap coordinates, no need for cache{X,Y}off */
>      if (!pExaScr->info->UploadToScreen(pCachePixmap,
> -				       CACHE_X(pos) + cacheXoff,
> -				       CACHE_Y(pos) + cacheYoff,
> +				       CACHE_X(pos),
> +				       CACHE_Y(pos),
>  				       pGlyph->info.width,
>  				       pGlyph->info.height,
>  				       (char *)pExaPixmap->sys_ptr,

You could use exaPixmapIsOffscreen() instead of exaGetOffscreenPixmap()
and get rid of the cacheX/Yoff variables entirely.


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