From d043ccee3788ea4192806bd8c94484ed003fa828 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Mon, 8 Apr 2013 19:43:22 +0000 Subject: Allow single-pass filters (which use asNewEffect()) to participate in the image filter DAG. This was done by introducing the SkSinglePassImageFilter abstract base class, which implements canFilterImageGPU() and filterImageGPU() on behalf of the derived class. The derived class still only needs to asNewEffect(). This allows us to recurse on the filter input in SkSinglePassImageFilter::onFilterImageGPU(). It also allows us to remove any knowledge of single-pass image filters from SkGpuDevice and from the SkImageFilter base class as well. BUG= Review URL: https://codereview.chromium.org/13602013 git-svn-id: http://skia.googlecode.com/svn/trunk@8563 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp/core.gypi | 2 ++ gyp/effects.gypi | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gyp') diff --git a/gyp/core.gypi b/gyp/core.gypi index 811f89b62f..3fc5263c6b 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -96,6 +96,7 @@ '<(skia_src_path)/core/SkGraphics.cpp', '<(skia_src_path)/core/SkInstCnt.cpp', '<(skia_src_path)/core/SkImageFilter.cpp', + '<(skia_src_path)/core/SkImageFilterUtils.cpp', '<(skia_src_path)/core/SkLineClipper.cpp', '<(skia_src_path)/core/SkMallocPixelRef.cpp', '<(skia_src_path)/core/SkMask.cpp', @@ -230,6 +231,7 @@ '<(skia_include_path)/core/SkGeometry.h', '<(skia_include_path)/core/SkGraphics.h', '<(skia_include_path)/core/SkImageFilter.h', + '<(skia_include_path)/core/SkImageFilterUtils.h', '<(skia_include_path)/core/SkInstCnt.h', '<(skia_include_path)/core/SkMallocPixelRef.h', '<(skia_include_path)/core/SkMask.h', diff --git a/gyp/effects.gypi b/gyp/effects.gypi index e3f4bf5089..3eb0d950d9 100644 --- a/gyp/effects.gypi +++ b/gyp/effects.gypi @@ -31,7 +31,6 @@ '<(skia_src_path)/effects/SkEmbossMask.h', '<(skia_src_path)/effects/SkEmbossMask_Table.h', '<(skia_src_path)/effects/SkEmbossMaskFilter.cpp', - '<(skia_src_path)/effects/SkImageFilterUtils.cpp', '<(skia_src_path)/effects/SkKernel33MaskFilter.cpp', '<(skia_src_path)/effects/SkLayerDrawLooper.cpp', '<(skia_src_path)/effects/SkLayerRasterizer.cpp', @@ -89,7 +88,6 @@ '<(skia_include_path)/effects/SkDrawExtraPathEffect.h', '<(skia_include_path)/effects/SkEmbossMaskFilter.h', '<(skia_include_path)/effects/SkGradientShader.h', - '<(skia_include_path)/effects/SkImageFilterUtils.h', '<(skia_include_path)/effects/SkKernel33MaskFilter.h', '<(skia_include_path)/effects/SkLayerDrawLooper.h', '<(skia_include_path)/effects/SkLayerRasterizer.h', -- cgit v1.2.3