diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-07-08 07:58:18 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-08 07:58:18 -0700 |
| commit | 2cff176fa25e962f7ae53ebeefa833f0eed276cc (patch) | |
| tree | 545ff9876e92d4ad8c177c82cc2b2ee6babdaa1c /include | |
| parent | f5179a4c490bc787190321bd8ffdb0e6a4efa9ac (diff) | |
More threading of GrShaderDataManager
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1213613016
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkColorFilter.h | 4 | ||||
| -rw-r--r-- | include/effects/SkColorCubeFilter.h | 3 | ||||
| -rw-r--r-- | include/effects/SkColorMatrixFilter.h | 3 | ||||
| -rw-r--r-- | include/effects/SkLumaColorFilter.h | 3 | ||||
| -rw-r--r-- | include/effects/SkModeColorFilter.h | 3 |
5 files changed, 11 insertions, 5 deletions
diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h index 5ba1a8fa44..c4109dcdd1 100644 --- a/include/core/SkColorFilter.h +++ b/include/core/SkColorFilter.h @@ -16,6 +16,7 @@ class SkBitmap; class GrProcessor; class GrContext; +class GrShaderDataManager; /** * ColorFilters are optional objects in the drawing pipeline. When present in @@ -134,7 +135,8 @@ public: * * If the subclass returns false, then it should not modify the array at all. */ - virtual bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const { + virtual bool asFragmentProcessors(GrContext*, GrShaderDataManager*, + SkTDArray<GrFragmentProcessor*>*) const { return false; } diff --git a/include/effects/SkColorCubeFilter.h b/include/effects/SkColorCubeFilter.h index 4999bc5777..1fc355ed42 100644 --- a/include/effects/SkColorCubeFilter.h +++ b/include/effects/SkColorCubeFilter.h @@ -25,7 +25,8 @@ public: uint32_t getFlags() const override; #if SK_SUPPORT_GPU - bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const override; + bool asFragmentProcessors(GrContext*, GrShaderDataManager*, + SkTDArray<GrFragmentProcessor*>*) const override; #endif SK_TO_STRING_OVERRIDE() diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h index 47092739f2..2dc6b4903d 100644 --- a/include/effects/SkColorMatrixFilter.h +++ b/include/effects/SkColorMatrixFilter.h @@ -26,7 +26,8 @@ public: SkColorFilter* newComposed(const SkColorFilter*) const override; #if SK_SUPPORT_GPU - bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const override; + bool asFragmentProcessors(GrContext*, GrShaderDataManager*, + SkTDArray<GrFragmentProcessor*>*) const override; #endif struct State { diff --git a/include/effects/SkLumaColorFilter.h b/include/effects/SkLumaColorFilter.h index 4e8ac798e6..4cca2d4ede 100644 --- a/include/effects/SkLumaColorFilter.h +++ b/include/effects/SkLumaColorFilter.h @@ -28,7 +28,8 @@ public: void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const override; #if SK_SUPPORT_GPU - bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const override; + bool asFragmentProcessors(GrContext*, GrShaderDataManager*, + SkTDArray<GrFragmentProcessor*>*) const override; #endif SK_TO_STRING_OVERRIDE() diff --git a/include/effects/SkModeColorFilter.h b/include/effects/SkModeColorFilter.h index a2cb841699..17f135a28e 100644 --- a/include/effects/SkModeColorFilter.h +++ b/include/effects/SkModeColorFilter.h @@ -39,7 +39,8 @@ public: #endif #if SK_SUPPORT_GPU - bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const override; + bool asFragmentProcessors(GrContext*, GrShaderDataManager*, + SkTDArray<GrFragmentProcessor*>*) const override; #endif SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkModeColorFilter) |