From 16a87a89e1330c18876aaf17ccc6f07243062ca8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Sun, 21 Jun 2009 15:09:02 -0400 Subject: [PATCH] Move FbGen macro into pixman-combine.c --- pixman/pixman-combine.c.template | 6 +++++- pixman/pixman-combine.h.template | 5 ----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pixman/pixman-combine.c.template b/pixman/pixman-combine.c.template index 2f4d6a7..7d05ce8 100644 --- a/pixman/pixman-combine.c.template +++ b/pixman/pixman-combine.c.template @@ -16,7 +16,6 @@ * this difference will have two versions using the same convention. */ - /* * All of the composing functions */ @@ -343,6 +342,11 @@ fbCombineConjointInPart (comp1_t a, comp1_t b) return IntDiv(b,a); /* b/a */ } +#define FbGen(x,y,i,ax,ay,t,u,v) ((t) = (IntMult(GetComp(y,i),ay,(u)) + \ + IntMult(GetComp(x,i),ax,(v))), \ + (comp4_t) ((comp1_t) ((t) | \ + (0 - ((t) >> G_SHIFT)))) << (i)) + static void fbCombineDisjointGeneralU (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width, comp1_t combine) { diff --git a/pixman/pixman-combine.h.template b/pixman/pixman-combine.h.template index 6ecd301..f2e58a1 100644 --- a/pixman/pixman-combine.h.template +++ b/pixman/pixman-combine.h.template @@ -29,11 +29,6 @@ #define Add(x,y,i,t) ((t) = GetComp(x,i) + GetComp(y,i), \ (comp4_t) ((comp1_t) ((t) | (0 - ((t) >> G_SHIFT)))) << (i)) -#define FbGen(x,y,i,ax,ay,t,u,v) ((t) = (IntMult(GetComp(y,i),ay,(u)) + \ - IntMult(GetComp(x,i),ax,(v))), \ - (comp4_t) ((comp1_t) ((t) | \ - (0 - ((t) >> G_SHIFT)))) << (i)) - /* The methods below use some tricks to be able to do two color components at the same time. -- 2.7.4