[Nouveau] [PATCH] avoid build fail without COMPOSITE

[Emil Velikov]

On 14 July 2015 at 22:17, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> ---
>  src/nouveau_dri2.c | 15 ++++++++++-----
>  1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c
> index f22e319..4398559 100644
> --- a/src/nouveau_dri2.c
> +++ b/src/nouveau_dri2.c
> @@ -142,6 +142,7 @@ nouveau_dri2_copy_region2(ScreenPtr pScreen, DrawablePtr pDraw, RegionPtr pRegio
>         NVPtr pNv = NVPTR(xf86ScreenToScrn(pScreen));
>         RegionPtr pCopyClip;
>         GCPtr pGC;
> +       PixmapPtr pPix;
>         DrawablePtr src_draw, dst_draw;
>         Bool translate = FALSE;
>         int off_x = 0, off_y = 0;
> @@ -170,9 +171,13 @@ nouveau_dri2_copy_region2(ScreenPtr pScreen, DrawablePtr pDraw, RegionPtr pRegio
>         }
>
>         if (translate && pDraw->type == DRAWABLE_WINDOW) {
> -               PixmapPtr pPix = get_drawable_pixmap(pDraw);
> -               off_x = pDraw->x - pPix->screen_x;
> -               off_y = pDraw->y - pPix->screen_y;
> +               off_x = pDraw->x;
> +               off_y = pDraw->y;
> +#ifdef COMPOSITE
> +               pPix = get_drawable_pixmap(pDraw);
> +               off_x -= pPix->screen_x;
> +               off_y -= pPix->screen_y;
> +#endif
If I understand things correctly both ati and the intel ddx seems set
the offsets to zero when composite is missing.
I doubt that many people build xserver without it though :-)

-Emil