Changeset 224996 in webkit

Timestamp:

Nov 17, 2017, 3:36:24 PM (7 years ago)

Author:

Simon Fraser

Message:

Don't invert a matrix for every channel of every pixel of an FETurbulence filter
​https://bugs.webkit.org/show_bug.cgi?id=179829

Reviewed by Dean Jackson.

FETurbulence::fillRegion() called filter().mapAbsolutePointToLocalPoint(point) for each
of the 4 channels on a point, which is stupid.

Fix to invert the matrix once, and then map the point once for each pixel. This reduces
the time in fillRegion() function by about 30%.

• platform/graphics/filters/FETurbulence.cpp:

(WebCore::FETurbulence::fillRegion):

• platform/graphics/filters/Filter.h:

(WebCore::Filter::absoluteTransform const):
(WebCore::Filter::mapAbsolutePointToLocalPoint const): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/filters/FETurbulence.cpp (modified) (8 diffs)
• platform/graphics/filters/FETurbulence.h (modified) (1 diff)
• platform/graphics/filters/Filter.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-17  Simon Fraser  <simon.fraser@apple.com>
+
+        Don't invert a matrix for every channel of every pixel of an FETurbulence filter
+        https://bugs.webkit.org/show_bug.cgi?id=179829
+
+        Reviewed by Dean Jackson.
+        
+        FETurbulence::fillRegion() called filter().mapAbsolutePointToLocalPoint(point) for each
+        of the 4 channels on a point, which is stupid.
+        
+        Fix to invert the matrix once, and then map the point once for each pixel. This reduces
+        the time in fillRegion() function by about 30%.
+
+        * platform/graphics/filters/FETurbulence.cpp:
+        (WebCore::FETurbulence::fillRegion):
+        * platform/graphics/filters/Filter.h:
+        (WebCore::Filter::absoluteTransform const):
+        (WebCore::Filter::mapAbsolutePointToLocalPoint const): Deleted.
+
 2017-11-17  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/platform/graphics/filters/FETurbulence.cpp

@@ -65 +65 @@
 }
 
-TurbulenceType FETurbulence::type() const
-{
-    return m_type;
-}
-
 bool FETurbulence::setType(TurbulenceType type)
 {
@@ -78 +73 @@
 }
 
-float FETurbulence::baseFrequencyY() const
-{
-    return m_baseFrequencyY;
-}
-
 bool FETurbulence::setBaseFrequencyY(float baseFrequencyY)
 {
@@ -91 +81 @@
 }
 
-float FETurbulence::baseFrequencyX() const
-{
-    return m_baseFrequencyX;
-}
-
 bool FETurbulence::setBaseFrequencyX(float baseFrequencyX)
 {
@@ -104 +89 @@
 }
 
-float FETurbulence::seed() const
-{
-    return m_seed; 
-}
-
 bool FETurbulence::setSeed(float seed)
 {
@@ -117 +97 @@
 }
 
-int FETurbulence::numOctaves() const
-{
-    return m_numOctaves;
-}
-
 bool FETurbulence::setNumOctaves(int numOctaves)
 {
@@ -128 +103 @@
     m_numOctaves = numOctaves;
     return true;
-}
-
-bool FETurbulence::stitchTiles() const
-{
-    return m_stitchTiles;
 }
 
@@ -335 +305 @@
 {
     IntRect filterRegion = absolutePaintRect();
-    IntPoint point(0, filterRegion.y() + startY);
+    FloatPoint point(0, filterRegion.y() + startY);
     int indexOfPixelChannel = startY * (filterRegion.width() << 2);
-    int channel;
     StitchData stitchData;
+    AffineTransform inverseTransfrom = filter().absoluteTransform().inverse().value_or(AffineTransform());
 
     for (int y = startY; y < endY; ++y) {
@@ -345 +315 @@
         for (int x = 0; x < filterRegion.width(); ++x) {
             point.setX(point.x() + 1);
-            for (channel = 0; channel < 4; ++channel, ++indexOfPixelChannel)
-                pixelArray->set(indexOfPixelChannel, calculateTurbulenceValueForPoint(channel, paintingData, stitchData, filter().mapAbsolutePointToLocalPoint(point)));
+            FloatPoint localPoint = inverseTransfrom.mapPoint(point);
+            for (int channel = 0; channel < 4; ++channel, ++indexOfPixelChannel)
+                pixelArray->set(indexOfPixelChannel, calculateTurbulenceValueForPoint(channel, paintingData, stitchData, localPoint));
         }
     }

trunk/Source/WebCore/platform/graphics/filters/FETurbulence.h

@@ -40 +40 @@
     static Ref<FETurbulence> create(Filter&, TurbulenceType, float, float, int, float, bool);
 
-    TurbulenceType type() const;
+    TurbulenceType type() const { return m_type; }
     bool setType(TurbulenceType);
 
-    float baseFrequencyY() const;
+    float baseFrequencyY() const { return m_baseFrequencyX; }
     bool setBaseFrequencyY(float);
 
-    float baseFrequencyX() const;
+    float baseFrequencyX() const { return m_baseFrequencyY; }
     bool setBaseFrequencyX(float);
 
-    float seed() const;
+    float seed() const { return m_seed; }
     bool setSeed(float);
 
-    int numOctaves() const;
+    int numOctaves() const { return m_numOctaves; }
     bool setNumOctaves(int);
 
-    bool stitchTiles() const;
+    bool stitchTiles() const { return m_stitchTiles; }
     bool setStitchTiles(bool);
 

trunk/Source/WebCore/platform/graphics/filters/Filter.h

@@ -44 +44 @@
 
     const AffineTransform& absoluteTransform() const { return m_absoluteTransform; }
-    FloatPoint mapAbsolutePointToLocalPoint(const FloatPoint& point) const { return m_absoluteTransform.inverse().value_or(AffineTransform()).mapPoint(point); }
 
     RenderingMode renderingMode() const { return m_renderingMode; }