From d970d9de1c98bc828365f15fb08aaa8dda214dd6 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 19 Nov 2010 22:28:22 -0800 Subject: Bug 31640 - x11perf: Doesn't build without libXft https://bugs.freedesktop.org/show_bug.cgi?id=31640 Fix trapezoid checks to look for both render & xft Signed-off-by: Alan Coopersmith --- do_tests.c | 2 +- do_traps.c | 2 +- x11perf.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/do_tests.c b/do_tests.c index ce3026b..e4f3cb1 100644 --- a/do_tests.c +++ b/do_tests.c @@ -788,7 +788,7 @@ Test test[] = { InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids, V1_4FEATURE, ROP, 0, {2, 300, "escherknot", NULL, FillTiled}}, -#ifdef XRENDER +#if defined(XRENDER) && defined(XFT) {"-aatrap1", "Fill 1x1 aa trap", NULL, InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps, V1_5FEATURE, NONROP, 0, diff --git a/do_traps.c b/do_traps.c index 326b56e..05f43c2 100644 --- a/do_traps.c +++ b/do_traps.c @@ -104,7 +104,7 @@ EndTrapezoids(XParms xp, Parms p) free(points); } -#ifdef XRENDER +#if defined(XRENDER) && defined(XFT) #include #include diff --git a/x11perf.h b/x11perf.h index 597b1f7..1deb037 100644 --- a/x11perf.h +++ b/x11perf.h @@ -291,7 +291,7 @@ extern void EndAAText ( XParms xp, Parms p ); extern int InitTrapezoids ( XParms xp, Parms p, int reps ); extern void DoTrapezoids ( XParms xp, Parms p, int reps ); extern void EndTrapezoids ( XParms xp, Parms p ); -#ifdef XRENDER +#if defined(XRENDER) && defined(XFT) extern int InitFixedTraps ( XParms xp, Parms p, int reps ); extern void DoFixedTraps ( XParms xp, Parms p, int reps ); extern void EndFixedTraps ( XParms xp, Parms p ); -- cgit v1.2.3