Remove ENABLE_OPENCL fully
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Nov 2018 15:39:52 +0000 (15:39 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Nov 2018 15:39:52 +0000 (15:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=191172

Patch by Rob Buis <rbuis@igalia.com> on 2018-11-02
Reviewed by Yusuke Suzuki.

No new tests since no change in functionality.

* platform/graphics/filters/FilterEffect.h:
(WebCore::FilterEffect::hasResult const):
(WebCore::FilterEffect::applyAll):
(WebCore::FilterEffect::openCLImage): Deleted.
(WebCore::FilterEffect::setOpenCLImage): Deleted.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237732 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/filters/FilterEffect.h

index 600fde7..a23cc2d 100644 (file)
@@ -1,3 +1,18 @@
+2018-11-02  Rob Buis  <rbuis@igalia.com>
+
+        Remove ENABLE_OPENCL fully
+        https://bugs.webkit.org/show_bug.cgi?id=191172
+
+        Reviewed by Yusuke Suzuki.
+
+        No new tests since no change in functionality.
+
+        * platform/graphics/filters/FilterEffect.h:
+        (WebCore::FilterEffect::hasResult const):
+        (WebCore::FilterEffect::applyAll):
+        (WebCore::FilterEffect::openCLImage): Deleted.
+        (WebCore::FilterEffect::setOpenCLImage): Deleted.
+
 2018-11-02  Zalan Bujtas  <zalan@apple.com>
 
         [LFC][IFC] Add support for intrinsic width calculation
index abb7b0f..8c26e2b 100644 (file)
@@ -63,12 +63,6 @@ public:
     void copyUnmultipliedResult(Uint8ClampedArray& destination, const IntRect&);
     void copyPremultipliedResult(Uint8ClampedArray& destination, const IntRect&);
 
-#if ENABLE(OPENCL)
-    OpenCLHandle openCLImage() { return m_openCLImageResult; }
-    void setOpenCLImage(OpenCLHandle openCLImage) { m_openCLImageResult = openCLImage; }
-    ImageBuffer* openCLImageToImageBuffer();
-#endif
-
     FilterEffectVector& inputEffects() { return m_inputEffects; }
     FilterEffect* inputEffect(unsigned) const;
     unsigned numberOfEffectInputs() const { return m_inputEffects.size(); }
@@ -78,9 +72,6 @@ public:
     {
         // This function needs platform specific checks, if the memory managment is not done by FilterEffect.
         return m_imageBufferResult
-#if ENABLE(OPENCL)
-            || m_openCLImageResult
-#endif
             || m_unmultipliedImageResult
             || m_premultipliedImageResult;
     }
@@ -102,11 +93,7 @@ public:
     void setMaxEffectRect(const FloatRect& maxEffectRect) { m_maxEffectRect = maxEffectRect; } 
 
     void apply();
-#if ENABLE(OPENCL)
-    void applyAll();
-#else
     inline void applyAll() { apply(); }
-#endif
 
     // Correct any invalid pixels, if necessary, in the result of a filter operation.
     // This method is used to ensure valid pixel values on filter inputs and the final result.
@@ -166,9 +153,6 @@ protected:
     ImageBuffer* createImageBufferResult();
     Uint8ClampedArray* createUnmultipliedImageResult();
     Uint8ClampedArray* createPremultipliedImageResult();
-#if ENABLE(OPENCL)
-    OpenCLHandle createOpenCLImageResult(uint8_t* = 0);
-#endif
 
     // Return true if the filter will only operate correctly on valid RGBA values, with
     // alpha in [0,255] and each color component in [0, alpha].
@@ -198,9 +182,6 @@ private:
     std::unique_ptr<ImageBuffer> m_imageBufferResult;
     RefPtr<Uint8ClampedArray> m_unmultipliedImageResult;
     RefPtr<Uint8ClampedArray> m_premultipliedImageResult;
-#if ENABLE(OPENCL)
-    OpenCLHandle m_openCLImageResult;
-#endif
 
     IntRect m_absolutePaintRect;