Attachment 122365 Details for Bug 94568 – [xserver,RFC,v2] glamor: fix wrong offset on composite rectangles

[patch] [xserver,RFC,v2] glamor: fix wrong offset on composite rectangles

0001-glamor-fix-wrong-offset-on-composite-rectangles.patch (text/plain), 2.29 KB, created by Olivier Fourdan on 2016-03-17 08:56:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Fourdan

Created: 2016-03-17 08:56:56 UTC

Size: 2.29 KB

patch

obsolete

>From 4b8b6b98e5b6aa404a7c92f2ac7c25065ef66756 Mon Sep 17 00:00:00 2001
>From: Olivier Fourdan <ofourdan@redhat.com>
>Date: Thu, 17 Mar 2016 09:37:14 +0100
>Subject: [PATCH xserver RFC v2] glamor: fix wrong offset on composite rectangles
>
>When using PictOpSrc, the destination is wrongly shifted back to (0, 0).
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94568
>
>Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
>---
> v2: Cleaup-up, move relevant code where it's actually used;
>     Note: I am not entirely confident with this patch, it fixes the issue
>     for me but I am definitely not certain it's correct...
>
> glamor/glamor_compositerects.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
>diff --git a/glamor/glamor_compositerects.c b/glamor/glamor_compositerects.c
>index 885a6c0..199e627 100644
>--- a/glamor/glamor_compositerects.c
>+++ b/glamor/glamor_compositerects.c
>@@ -107,7 +107,6 @@ glamor_composite_rectangles(CARD8 op,
>     struct glamor_pixmap_private *priv;
>     pixman_region16_t region;
>     pixman_box16_t *boxes;
>-    int dst_x, dst_y;
>     int num_boxes;
>     PicturePtr source = NULL;
>     Bool need_free_region = FALSE;
>@@ -225,17 +224,18 @@ glamor_composite_rectangles(CARD8 op,
>            RegionExtents(&region)->x2, RegionExtents(&region)->y2,
>            RegionNumRects(&region));
> 
>-    glamor_get_drawable_deltas(dst->pDrawable, pixmap, &dst_x, &dst_y);
>-    pixman_region_translate(&region, dst_x, dst_y);
>-
>-    DEBUGF("%s: pixmap +(%d, %d) extents (%d, %d),(%d, %d)\n",
>-           __FUNCTION__, dst_x, dst_y,
>-           RegionExtents(&region)->x1, RegionExtents(&region)->y1,
>-           RegionExtents(&region)->x2, RegionExtents(&region)->y2);
>-
>     boxes = pixman_region_rectangles(&region, &num_boxes);
>     if (op == PictOpSrc || op == PictOpClear) {
>         CARD32 pixel;
>+        int dst_x, dst_y;
>+
>+        glamor_get_drawable_deltas(dst->pDrawable, pixmap, &dst_x, &dst_y);
>+        pixman_region_translate(&region, dst_x, dst_y);
>+
>+        DEBUGF("%s: pixmap +(%d, %d) extents (%d, %d),(%d, %d)\n",
>+               __FUNCTION__, dst_x, dst_y,
>+               RegionExtents(&region)->x1, RegionExtents(&region)->y1,
>+               RegionExtents(&region)->x2, RegionExtents(&region)->y2);
> 
>         if (op == PictOpClear)
>             pixel = 0;
>-- 
>2.5.0
>

Actions: View | Splinter Review

Attachments on bug 94568: 122340 | 122341 | 122342 | 122364 | 122365

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.