Attachment 5946 Details for Bug 2488 – Similar patch for fb in xserver

[patch] Similar patch for fb in xserver

fdo-2488.patch (text/plain), 2.11 KB, created by Kristian Høgsberg on 2006-06-16 15:29:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kristian Høgsberg

Created: 2006-06-16 15:29:35 UTC

Size: 2.11 KB

patch

obsolete

>diff --git a/fb/fbcompose.c b/fb/fbcompose.c
>index c4f979d..45497a6 100644
>--- a/fb/fbcompose.c
>+++ b/fb/fbcompose.c
>@@ -2717,8 +2717,9 @@ static void fbFetchSourcePict(PicturePtr
>         xFixed_32_32 l;
>         xFixed_48_16 dx, dy, a, b, off;
> 
>-        v.vector[0] = IntToxFixed(x);
>-        v.vector[1] = IntToxFixed(y);
>+        /* reference point is the center of the pixel */
>+        v.vector[0] = IntToxFixed(x) + xFixed1/2;
>+        v.vector[1] = IntToxFixed(y) + xFixed1/2;
>         v.vector[2] = xFixed1;
>         if (pict->transform) {
>             if (!PictureTransformPoint3d (pict->transform, &v))
>@@ -2784,8 +2785,9 @@ static void fbFetchSourcePict(PicturePtr
> 
>         if (pict->transform) {
>             PictVector v;
>-            v.vector[0] = IntToxFixed(x);
>-            v.vector[1] = IntToxFixed(y);
>+            /* reference point is the center of the pixel */
>+            v.vector[0] = IntToxFixed(x) + xFixed1/2;
>+            v.vector[1] = IntToxFixed(y) + xFixed1/2;
>             v.vector[2] = xFixed1;
>             if (!PictureTransformPoint3d (pict->transform, &v))
>                 return;
>@@ -2905,8 +2907,9 @@ static void fbFetchTransformed(PicturePt
>     dx = pict->pDrawable->x;
>     dy = pict->pDrawable->y;
> 
>-    v.vector[0] = IntToxFixed(x - dx);
>-    v.vector[1] = IntToxFixed(y - dy);
>+    /* reference point is the center of the pixel */
>+    v.vector[0] = IntToxFixed(x - dx) + xFixed1 / 2;
>+    v.vector[1] = IntToxFixed(y - dy) + xFixed1 / 2;
>     v.vector[2] = xFixed1;
> 
>     /* when using convolution filters one might get here without a transform */
>@@ -3011,6 +3014,12 @@ static void fbFetchTransformed(PicturePt
>             }
>         }
>     } else if (pict->filter == PictFilterBilinear) {
>+        /* adjust vector for maximum contribution at 0.5, 0.5 of each texel. */
>+        v.vector[0] -= v.vector[2] / 2;
>+        v.vector[1] -= v.vector[2] / 2;
>+        unit.vector[0] -= unit.vector[2] / 2;
>+        unit.vector[1] -= unit.vector[2] / 2;
>+
>         if (pict->repeatType == RepeatNormal) {
>             if (REGION_NUM_RECTS(pict->pCompositeClip) == 1) {
>                 for (i = 0; i < width; ++i) {

Actions: View | Splinter Review

Attachments on bug 2488: 1848 | 1849 | 3296 | 5946

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.