From 5e3d492692e9775c04554b63d04fd08f10424768 Mon Sep 17 00:00:00 2001 From: "rgabor@webkit.org" Date: Fri, 6 Jul 2012 10:05:07 +0000 Subject: [PATCH] Fixing defines for NEON intrinsics. https://bugs.webkit.org/show_bug.cgi?id=90666 Reviewed by Zoltan Herczeg. Existing tests cover this issue. * platform/graphics/filters/FEGaussianBlur.cpp: (WebCore::FEGaussianBlur::platformApplyGeneric): * platform/graphics/filters/arm/FEGaussianBlurNEON.h: * platform/graphics/filters/arm/NEONHelpers.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121951 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 14 ++++++++++++++ .../WebCore/platform/graphics/filters/FEGaussianBlur.cpp | 4 ++-- .../platform/graphics/filters/arm/FEGaussianBlurNEON.h | 4 ++-- Source/WebCore/platform/graphics/filters/arm/NEONHelpers.h | 4 ++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 2f3814a..489491d 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,17 @@ +2012-07-06 Gabor Rapcsanyi + + Fixing defines for NEON intrinsics. + https://bugs.webkit.org/show_bug.cgi?id=90666 + + Reviewed by Zoltan Herczeg. + + Existing tests cover this issue. + + * platform/graphics/filters/FEGaussianBlur.cpp: + (WebCore::FEGaussianBlur::platformApplyGeneric): + * platform/graphics/filters/arm/FEGaussianBlurNEON.h: + * platform/graphics/filters/arm/NEONHelpers.h: + 2012-07-05 Vsevolod Vlasov Web Inspector: Workspace should dispatch WorkspaceReset event on navigation. diff --git a/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp b/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp index 381f2ae..1950ee9 100644 --- a/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp +++ b/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp @@ -120,7 +120,7 @@ inline void FEGaussianBlur::platformApplyGeneric(Uint8ClampedArray* srcPixelArra for (int i = 0; i < 3; ++i) { if (kernelSizeX) { kernelPosition(i, kernelSizeX, dxLeft, dxRight); -#if CPU(ARM_NEON) && COMPILER(GCC) +#if HAVE(ARM_NEON_INTRINSICS) if (!isAlphaImage()) boxBlurNEON(src, dst, kernelSizeX, dxLeft, dxRight, 4, stride, paintSize.width(), paintSize.height()); else @@ -133,7 +133,7 @@ inline void FEGaussianBlur::platformApplyGeneric(Uint8ClampedArray* srcPixelArra if (kernelSizeY) { kernelPosition(i, kernelSizeY, dyLeft, dyRight); -#if CPU(ARM_NEON) && COMPILER(GCC) +#if HAVE(ARM_NEON_INTRINSICS) if (!isAlphaImage()) boxBlurNEON(src, dst, kernelSizeY, dyLeft, dyRight, stride, 4, paintSize.height(), paintSize.width()); else diff --git a/Source/WebCore/platform/graphics/filters/arm/FEGaussianBlurNEON.h b/Source/WebCore/platform/graphics/filters/arm/FEGaussianBlurNEON.h index 61be238..93b46cf 100644 --- a/Source/WebCore/platform/graphics/filters/arm/FEGaussianBlurNEON.h +++ b/Source/WebCore/platform/graphics/filters/arm/FEGaussianBlurNEON.h @@ -29,7 +29,7 @@ #include -#if CPU(ARM_NEON) && COMPILER(GCC) +#if ENABLE(FILTERS) && HAVE(ARM_NEON_INTRINSICS) #include "FEGaussianBlur.h" #include "NEONHelpers.h" @@ -74,6 +74,6 @@ inline void boxBlurNEON(Uint8ClampedArray* srcPixelArray, Uint8ClampedArray* dst } // namespace WebCore -#endif // CPU(ARM_NEON) && COMPILER(GCC) +#endif // ENABLE(FILTERS) && HAVE(ARM_NEON_INTRINSICS) #endif // FEGaussianBlurNEON_h diff --git a/Source/WebCore/platform/graphics/filters/arm/NEONHelpers.h b/Source/WebCore/platform/graphics/filters/arm/NEONHelpers.h index a9d04a8..78a3241 100644 --- a/Source/WebCore/platform/graphics/filters/arm/NEONHelpers.h +++ b/Source/WebCore/platform/graphics/filters/arm/NEONHelpers.h @@ -29,7 +29,7 @@ #include -#if CPU(ARM_NEON) && COMPILER(GCC) +#if ENABLE(FILTERS) && HAVE(ARM_NEON_INTRINSICS) #include @@ -51,6 +51,6 @@ inline void storeFloatAsRGBA8(float32x4_t data, uint32_t* destination) } // namespace WebCore -#endif // CPU(ARM_NEON) && COMPILER(GCC) +#endif // ENABLE(FILTERS) && HAVE(ARM_NEON_INTRINSICS) #endif // NEONHelpers_h -- 2.7.4