diff options
author | 2017-04-10 10:54:25 -0400 | |
---|---|---|
committer | 2017-04-10 15:38:47 +0000 | |
commit | d61c9d93b126dca0af17eff89be8536944dadf81 (patch) | |
tree | 975f3418b8f1f303a2530a2a4b67a97c82c86dcc /src/gpu/effects/GrCustomXfermode.cpp | |
parent | f9aa9e51691d83970039f42c623c1fd354552378 (diff) |
Move ref counting out of GrProcessor and into subclasses.
This will allow different subclasses to use different models for lifetime management.
GrXferProcessor moves to simple ref counting since they don't own GrGpuResources.
This also constifies GrXferProcessor factories.
Change-Id: I6bea0ea8de718874063224232f9da50887868b16
Reviewed-on: https://skia-review.googlesource.com/11792
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/effects/GrCustomXfermode.cpp')
-rw-r--r-- | src/gpu/effects/GrCustomXfermode.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp index 2cc8228ee5..970c28909e 100644 --- a/src/gpu/effects/GrCustomXfermode.cpp +++ b/src/gpu/effects/GrCustomXfermode.cpp @@ -213,10 +213,10 @@ public: : fMode(mode), fHWBlendEquation(hw_blend_equation(mode)) {} private: - sk_sp<GrXferProcessor> makeXferProcessor(const GrProcessorAnalysisColor&, - GrProcessorAnalysisCoverage, - bool hasMixedSamples, - const GrCaps&) const override; + sk_sp<const GrXferProcessor> makeXferProcessor(const GrProcessorAnalysisColor&, + GrProcessorAnalysisCoverage, + bool hasMixedSamples, + const GrCaps&) const override; AnalysisProperties analysisProperties(const GrProcessorAnalysisColor&, const GrProcessorAnalysisCoverage&, @@ -233,10 +233,11 @@ private: #pragma GCC diagnostic pop #endif -sk_sp<GrXferProcessor> CustomXPFactory::makeXferProcessor(const GrProcessorAnalysisColor&, - GrProcessorAnalysisCoverage coverage, - bool hasMixedSamples, - const GrCaps& caps) const { +sk_sp<const GrXferProcessor> CustomXPFactory::makeXferProcessor( + const GrProcessorAnalysisColor&, + GrProcessorAnalysisCoverage coverage, + bool hasMixedSamples, + const GrCaps& caps) const { SkASSERT(GrCustomXfermode::IsSupportedMode(fMode)); if (can_use_hw_blend_equation(fHWBlendEquation, coverage, caps)) { return sk_sp<GrXferProcessor>(new CustomXP(fMode, fHWBlendEquation)); |