diff options
| author |  senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-27 21:57:45 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-27 21:57:45 +0000 |
| commit | 9c39744a00573b7133fc765b0a9d50a0ceace7b8 (patch) | |
| tree | f416a1bf3e821884974ec2cf4e0d383ad75d16e2 /include/core | |
| parent | 200e53fa5fe7dae717a73224064a2fc37302e003 (diff) | |
Fix recursive GPU processing for SkImageFilter. Plumb through the
SkImageFilter::Proxy parameter to the GPU recursion path. Extract
DeviceImageFilterProxy from SkCanvas.cpp into its own .h, and rename it.
https://codereview.appspot.com/6575059/
git-svn-id: http://skia.googlecode.com/svn/trunk@5720 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkDevice.h | 2 | ||||
| -rw-r--r-- | include/core/SkImageFilter.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h index 851a167982..f0aa8e0a02 100644 --- a/include/core/SkDevice.h +++ b/include/core/SkDevice.h @@ -389,7 +389,7 @@ private: friend class SkDraw; friend class SkDrawIter; friend class SkDeviceFilteredPaint; - friend class DeviceImageFilterProxy; + friend class SkDeviceImageFilterProxy; friend class SkSurface_Raster; // used to change the backend's pixels (and possibly config/rowbytes) diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h index dd5aecde0f..92a5a58d28 100644 --- a/include/core/SkImageFilter.h +++ b/include/core/SkImageFilter.h @@ -106,7 +106,7 @@ public: * size, and return it to the caller. The default implementation returns * NULL. */ - virtual GrTexture* onFilterImageGPU(GrTexture* texture, const SkRect& rect); + virtual GrTexture* onFilterImageGPU(Proxy*, GrTexture* texture, const SkRect& rect); protected: SkImageFilter() {} |