Title: [237732] trunk/Source/WebCore
- Revision
- 237732
- Author
- commit-qu...@webkit.org
- Date
- 2018-11-02 08:39:52 -0700 (Fri, 02 Nov 2018)
Log Message
Remove ENABLE_OPENCL fully
https://bugs.webkit.org/show_bug.cgi?id=191172
Patch by Rob Buis <rb...@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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (237731 => 237732)
--- trunk/Source/WebCore/ChangeLog 2018-11-02 14:23:54 UTC (rev 237731)
+++ trunk/Source/WebCore/ChangeLog 2018-11-02 15:39:52 UTC (rev 237732)
@@ -1,3 +1,18 @@
+2018-11-02 Rob Buis <rb...@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 <za...@apple.com>
[LFC][IFC] Add support for intrinsic width calculation
Modified: trunk/Source/WebCore/platform/graphics/filters/FilterEffect.h (237731 => 237732)
--- trunk/Source/WebCore/platform/graphics/filters/FilterEffect.h 2018-11-02 14:23:54 UTC (rev 237731)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterEffect.h 2018-11-02 15:39:52 UTC (rev 237732)
@@ -63,12 +63,6 @@
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 @@
{
// 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 @@
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 @@
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 @@
std::unique_ptr<ImageBuffer> m_imageBufferResult;
RefPtr<Uint8ClampedArray> m_unmultipliedImageResult;
RefPtr<Uint8ClampedArray> m_premultipliedImageResult;
-#if ENABLE(OPENCL)
- OpenCLHandle m_openCLImageResult;
-#endif
IntRect m_absolutePaintRect;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
