Merge pull request #1235 from WebPlatformForEmbedded/pgorszkowski/2.38/ImplementFECompositeNeonArithmeticApplier

Implement fe composite neon arithmetic applier

Author: magomez

Source/WebCore/Sources.txt

@@ -2139,6 +2139,8 @@ platform/graphics/WebMResourceClient.cpp
 platform/graphics/WOFFFileFormat.cpp
 platform/graphics/WidthIterator.cpp
 platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp
+platform/graphics/cpu/arm/filters/FECompositeNeonArithmeticApplier.cpp
+platform/graphics/cpu/arm/filters/FELightingNEON.cpp
 platform/graphics/displaylists/DisplayList.cpp
 platform/graphics/displaylists/DisplayListDrawingContext.cpp
 platform/graphics/displaylists/DisplayListItems.cpp
@@ -2182,6 +2184,7 @@ platform/graphics/filters/SpotLightSource.cpp
 platform/graphics/filters/software/FEBlendSoftwareApplier.cpp
 platform/graphics/filters/software/FEColorMatrixSoftwareApplier.cpp
 platform/graphics/filters/software/FEComponentTransferSoftwareApplier.cpp
+platform/graphics/filters/software/FECompositeSoftwareArithmeticApplier.cpp
 platform/graphics/filters/software/FECompositeSoftwareApplier.cpp
 platform/graphics/filters/software/FEConvolveMatrixSoftwareApplier.cpp
 platform/graphics/filters/software/FEDisplacementMapSoftwareApplier.cpp

Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -11534,6 +11534,9 @@
 		722AF2E327E1CF110078D997 /* TextBoxIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextBoxIterator.h; sourceTree = "<group>"; };
 		722AF2E527E1D09E0078D997 /* CGContextStateSaver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGContextStateSaver.h; sourceTree = "<group>"; };
 		7241361A28985069007B3FCD /* FEBlendNeonApplier.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FEBlendNeonApplier.cpp; sourceTree = "<group>"; };
+		7241361F289863AC007B3FCD /* FECompositeNeonArithmeticApplier.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FECompositeNeonArithmeticApplier.cpp; sourceTree = "<group>"; };
+		724136202898652A007B3FCD /* FECompositeSoftwareArithmeticApplier.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FECompositeSoftwareArithmeticApplier.cpp; sourceTree = "<group>"; };
+		724136212898652A007B3FCD /* FECompositeSoftwareArithmeticApplier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FECompositeSoftwareArithmeticApplier.h; sourceTree = "<group>"; };
 		72435EF4273D07670005E7EE /* FilterImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FilterImage.h; sourceTree = "<group>"; };
 		72435EF5273D07670005E7EE /* FilterImage.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FilterImage.cpp; sourceTree = "<group>"; };
 		724DCF1B284853650026ACF4 /* ImageBufferAllocator.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ImageBufferAllocator.cpp; sourceTree = "<group>"; };
@@ -12953,7 +12956,7 @@
 		93309EA1099EB78C0056E581 /* Timer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Timer.cpp; sourceTree = "<group>"; };
 		9332AB3D16515D7700D827EC /* GraphicsContextGLNEON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsContextGLNEON.h; sourceTree = "<group>"; };
 		9332AB871653A97900D827EC /* FEBlendNeonApplier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FEBlendNeonApplier.h; sourceTree = "<group>"; };
-		9332AB881653A97900D827EC /* FECompositeArithmeticNEON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FECompositeArithmeticNEON.h; sourceTree = "<group>"; };
+		9332AB881653A97900D827EC /* FECompositeNeonArithmeticApplier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FECompositeNeonArithmeticApplier.h; sourceTree = "<group>"; };
 		9332AB891653A97900D827EC /* FEGaussianBlurNEON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FEGaussianBlurNEON.h; sourceTree = "<group>"; };
 		9332AB8A1653A97900D827EC /* FELightingNEON.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FELightingNEON.cpp; sourceTree = "<group>"; };
 		9332AB8B1653A97900D827EC /* FELightingNEON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FELightingNEON.h; sourceTree = "<group>"; };
@@ -25300,6 +25303,8 @@
 				72A13AB9274DDEC000E2A88E /* FEComponentTransferSoftwareApplier.h */,
 				72A13ABA274DE01200E2A88E /* FECompositeSoftwareApplier.cpp */,
 				72A13ABB274DE01200E2A88E /* FECompositeSoftwareApplier.h */,
+				724136202898652A007B3FCD /* FECompositeSoftwareArithmeticApplier.cpp */,
+				724136212898652A007B3FCD /* FECompositeSoftwareArithmeticApplier.h */,
 				72A13ABE274DE33F00E2A88E /* FEConvolveMatrixSoftwareApplier.cpp */,
 				72A13ABF274DE33F00E2A88E /* FEConvolveMatrixSoftwareApplier.h */,
 				72A13AC0274DE35900E2A88E /* FEDisplacementMapSoftwareApplier.cpp */,
@@ -25935,7 +25940,8 @@
 			children = (
 				7241361A28985069007B3FCD /* FEBlendNeonApplier.cpp */,
 				9332AB871653A97900D827EC /* FEBlendNeonApplier.h */,
-				9332AB881653A97900D827EC /* FECompositeArithmeticNEON.h */,
+				7241361F289863AC007B3FCD /* FECompositeNeonArithmeticApplier.cpp */,
+				9332AB881653A97900D827EC /* FECompositeNeonArithmeticApplier.h */,
 				9332AB891653A97900D827EC /* FEGaussianBlurNEON.h */,
 				9332AB8A1653A97900D827EC /* FELightingNEON.cpp */,
 				9332AB8B1653A97900D827EC /* FELightingNEON.h */,

…/arm/filters/FECompositeArithmeticNEON.h …ers/FECompositeNeonArithmeticApplier.cppSource/WebCore/platform/graphics/cpu/arm/filters/FECompositeArithmeticNEON.h renamed to Source/WebCore/platform/graphics/cpu/arm/filters/FECompositeNeonArithmeticApplier.cpp Source/WebCore/platform/graphics/cpu/arm/filters/FECompositeArithmeticNEON.h renamed to Source/WebCore/platform/graphics/cpu/arm/filters/FECompositeNeonArithmeticApplier.cpp

@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2011 University of Szeged
  * Copyright (C) 2011 Felician Marton
+ * Copyright (C) 2022 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -24,8 +25,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef FECompositeArithmeticNEON_h
-#define FECompositeArithmeticNEON_h
+#include "config.h"
+#include "FECompositeNeonArithmeticApplier.h"
 
 #if HAVE(ARM_NEON_INTRINSICS)
 
@@ -35,8 +36,14 @@
 
 namespace WebCore {
 
+FECompositeNeonArithmeticApplier::FECompositeNeonArithmeticApplier(const FEComposite& effect)
+    : Base(effect)
+{
+    ASSERT(m_effect.operation() == FECOMPOSITE_OPERATOR_ARITHMETIC);
+}
+
 template <int b1, int b4>
-inline void FECompositeSoftwareApplier::computeArithmeticPixelsNeon(const uint8_t* source, uint8_t* destination, unsigned pixelArrayLength, float k1, float k2, float k3, float k4)
+inline void FECompositeNeonArithmeticApplier::computePixels(const uint8_t* source, uint8_t* destination, unsigned pixelArrayLength, float k1, float k2, float k3, float k4)
 {
     float32x4_t k1x4 = vdupq_n_f32(k1 / 255);
     float32x4_t k2x4 = vdupq_n_f32(k2);
@@ -67,27 +74,52 @@ inline void FECompositeSoftwareApplier::computeArithmeticPixelsNeon(const uint8_
     }
 }
 
-inline void FECompositeSoftwareApplier::platformArithmeticNeon(const uint8_t* source, uint8_t* destination, unsigned pixelArrayLength, float k1, float k2, float k3, float k4)
+inline void FECompositeNeonArithmeticApplier::applyPlatform(const uint8_t* source, uint8_t* destination, unsigned pixelArrayLength, float k1, float k2, float k3, float k4)
 {
     if (!k4) {
         if (!k1) {
-            computeArithmeticPixelsNeon<0, 0>(source, destination, pixelArrayLength, k1, k2, k3, k4);
+            computePixels<0, 0>(source, destination, pixelArrayLength, k1, k2, k3, k4);
             return;
         }
 
-        computeArithmeticPixelsNeon<1, 0>(source, destination, pixelArrayLength, k1, k2, k3, k4);
+        computePixels<1, 0>(source, destination, pixelArrayLength, k1, k2, k3, k4);
         return;
     }
 
     if (!k1) {
-        computeArithmeticPixelsNeon<0, 1>(source, destination, pixelArrayLength, k1, k2, k3, k4);
+        computePixels<0, 1>(source, destination, pixelArrayLength, k1, k2, k3, k4);
         return;
     }
-    computeArithmeticPixelsNeon<1, 1>(source, destination, pixelArrayLength, k1, k2, k3, k4);
+    computePixels<1, 1>(source, destination, pixelArrayLength, k1, k2, k3, k4);
+}
+
+bool FECompositeNeonArithmeticApplier::apply(const Filter&, const FilterImageVector& inputs, FilterImage& result) const
+{
+    auto& input = inputs[0].get();
+    auto& input2 = inputs[1].get();
+
+    auto destinationPixelBuffer = result.pixelBuffer(AlphaPremultiplication::Premultiplied);
+    if (!destinationPixelBuffer)
+        return false;
+
+    IntRect effectADrawingRect = result.absoluteImageRectRelativeTo(input);
+    auto sourcePixelBuffer = input.getPixelBuffer(AlphaPremultiplication::Premultiplied, effectADrawingRect, m_effect.operatingColorSpace());
+    if (!sourcePixelBuffer)
+        return false;
+
+    IntRect effectBDrawingRect = result.absoluteImageRectRelativeTo(input2);
+    input2.copyPixelBuffer(*destinationPixelBuffer, effectBDrawingRect);
+
+    auto* sourcePixelBytes = sourcePixelBuffer->bytes();
+    auto* destinationPixelBytes = destinationPixelBuffer->bytes();
+
+    auto length = sourcePixelBuffer->sizeInBytes();
+    ASSERT(length == destinationPixelBuffer->sizeInBytes());
+
+    applyPlatform(sourcePixelBytes, destinationPixelBytes, length, m_effect.k1(), m_effect.k2(), m_effect.k3(), m_effect.k4());
+    return true;
 }
 
 } // namespace WebCore
 
 #endif // HAVE(ARM_NEON_INTRINSICS)
-
-#endif // FECompositeArithmeticNEON_h

Source/WebCore/platform/graphics/cpu/arm/filters/FECompositeNeonArithmeticApplier.h

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2011 University of Szeged
+ * Copyright (C) 2011 Felician Marton
+ * Copyright (C) 2022 Apple Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY UNIVERSITY OF SZEGED ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL UNIVERSITY OF SZEGED OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#if HAVE(ARM_NEON_INTRINSICS)
+
+#include "FilterEffectApplier.h"
+
+namespace WebCore {
+
+class FEComposite;
+
+class FECompositeNeonArithmeticApplier final : public FilterEffectConcreteApplier<FEComposite> {
+    WTF_MAKE_FAST_ALLOCATED;
+    using Base = FilterEffectConcreteApplier<FEComposite>;
+
+public:
+    FECompositeNeonArithmeticApplier(const FEComposite&);
+
+private:
+    template <int b1, int b4>
+    static inline void computePixels(const uint8_t* source, uint8_t* destination, unsigned pixelArrayLength, float k1, float k2, float k3, float k4);
+
+    static inline void applyPlatform(const uint8_t* source, uint8_t* destination, unsigned pixelArrayLength, float k1, float k2, float k3, float k4);
+
+    bool apply(const Filter&, const FilterImageVector& inputs, FilterImage& result) const final;
+};
+
+} // namespace WebCore
+
+#endif // HAVE(ARM_NEON_INTRINSICS)

Source/WebCore/platform/graphics/filters/FEComposite.cpp

@@ -25,7 +25,9 @@
 #include "config.h"
 #include "FEComposite.h"
 
+#include "FECompositeNeonArithmeticApplier.h"
 #include "FECompositeSoftwareApplier.h"
+#include "FECompositeSoftwareArithmeticApplier.h"
 #include "Filter.h"
 #include <wtf/text/TextStream.h>
 
@@ -108,7 +110,13 @@ FloatRect FEComposite::calculateImageRect(const Filter& filter, const FilterImag
 
 std::unique_ptr<FilterEffectApplier> FEComposite::createSoftwareApplier() const
 {
-    return FilterEffectApplier::create<FECompositeSoftwareApplier>(*this);
+    if (m_type != FECOMPOSITE_OPERATOR_ARITHMETIC)
+        return FilterEffectApplier::create<FECompositeSoftwareApplier>(*this);
+#if HAVE(ARM_NEON_INTRINSICS)
+    return FilterEffectApplier::create<FECompositeNeonArithmeticApplier>(*this);
+#else
+    return FilterEffectApplier::create<FECompositeSoftwareArithmeticApplier>(*this);
+#endif
 }
 
 static TextStream& operator<<(TextStream& ts, const CompositeOperationType& type)

Source/WebCore/platform/graphics/filters/FEComposite.h

@@ -73,6 +73,13 @@ class FEComposite : public FilterEffect {
 
     WTF::TextStream& externalRepresentation(WTF::TextStream&, FilterRepresentation) const override;
 
+#if HAVE(ARM_NEON_INTRINSICS)
+    template <int b1, int b4>
+    static inline void computeArithmeticPixelsNeon(const uint8_t* source, uint8_t* destination, unsigned pixelArrayLength, float k1, float k2, float k3, float k4);
+
+    static inline void platformArithmeticNeon(const uint8_t* source, uint8_t* destination, unsigned pixelArrayLength, float k1, float k2, float k3, float k4);
+#endif
+
     CompositeOperationType m_type;
     float m_k1;
     float m_k2;