1 From 10aaa5d2ffa62df99f03c857dc78e6ff2b33c183 Mon Sep 17 00:00:00 2001
2 From: Julien Cristau <jcristau@debian.org>
3 Date: Sun, 30 Sep 2012 12:02:11 +0200
4 Subject: [PATCH] Revert "fb: reorder Bresenham error correction to avoid
7 This reverts commit 3e62f48edf47a59d923ac58b6d4262b02456a556.
9 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54168
10 Debian: http://buss.debian.org/688908
12 Signed-off-by: Julien Cristau <jcristau@debian.org>
14 fb/fbseg.c | 18 +++++++++---------
15 1 file changed, 9 insertions(+), 9 deletions(-)
17 diff --git a/fb/fbseg.c b/fb/fbseg.c
18 index 1848387..0e4e0a9 100644
21 @@ -65,12 +65,6 @@ fbBresSolid(DrawablePtr pDrawable,
26 - WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, bits));
32 mask = fbBresShiftMask(mask, signdx, dstBpp);
34 @@ -80,12 +74,21 @@ fbBresSolid(DrawablePtr pDrawable,
39 + WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, bits));
46 WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, bits));
50 + WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, mask));
55 mask = fbBresShiftMask(mask, signdx, dstBpp);
56 @@ -94,9 +97,6 @@ fbBresSolid(DrawablePtr pDrawable,
60 - WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, mask));