diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-19 13:15:19 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-19 13:15:19 (GMT) |
| commit | 05b30326aa7c862cb8dd25e202267eb1e3c378a6 (patch) | |
| tree | bf531acac06acbf35dfef505053f324b6cde86c7 | |
| parent | 0b658e2bc30e4dc0a8cc90f13b2e63a8175081b0 (diff) | |
| download | Qt-05b30326aa7c862cb8dd25e202267eb1e3c378a6.zip Qt-05b30326aa7c862cb8dd25e202267eb1e3c378a6.tar.gz Qt-05b30326aa7c862cb8dd25e202267eb1e3c378a6.tar.bz2 | |
Tidy up the PRELOAD macro definitions in qdrawhelper.cpp.
Remove a little bit of duplicated code here after code reviews.
Reviewed-by: Miikka Heikkinen
| -rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 11 |
1 files 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 |