From 05b30326aa7c862cb8dd25e202267eb1e3c378a6 Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Wed, 19 Aug 2009 15:15:19 +0200 Subject: Tidy up the PRELOAD macro definitions in qdrawhelper.cpp. Remove a little bit of duplicated code here after code reviews. Reviewed-by: Miikka Heikkinen --- src/gui/painting/qdrawhelper.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 9ca5572..ddb47ce 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -1231,17 +1231,14 @@ static const uint L2CacheLineLengthInInts = L2CacheLineLength/sizeof(uint); // Two consecutive preloads stall, so space them out a bit by using different modulus. # define PRELOAD_COND2(x,y) if (((uint)&x[i])%L2CacheLineLength == 0) preload(&x[i] + L2CacheLineLengthInInts); \ if (((uint)&y[i])%L2CacheLineLength == 16) preload(&y[i] + L2CacheLineLengthInInts); -# else +# endif // QT_HAVE_ARMV6 +#endif // Q_CC_RVCT + +#if !defined(Q_CC_RVCT) || !defined(QT_HAVE_ARMV6) # define PRELOAD_INIT(x) # define PRELOAD_INIT2(x,y) # define PRELOAD_COND(x) # define PRELOAD_COND2(x,y) -# endif -#else -# define PRELOAD_INIT(x) -# define PRELOAD_INIT2(x,y) -# define PRELOAD_COND(x) -# define PRELOAD_COND2(x,y) #endif /* The constant alpha factor describes an alpha factor that gets applied -- cgit v0.12