diff options
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/SkArithmeticMode_gpu.cpp | 22 | ||||
| -rw-r--r-- | src/effects/SkArithmeticMode_gpu.h | 4 |
2 files changed, 12 insertions, 14 deletions
diff --git a/src/effects/SkArithmeticMode_gpu.cpp b/src/effects/SkArithmeticMode_gpu.cpp index f9a443d235..9f0873662b 100644 --- a/src/effects/SkArithmeticMode_gpu.cpp +++ b/src/effects/SkArithmeticMode_gpu.cpp @@ -152,7 +152,7 @@ public: bool enforcePMColor() const { return fEnforcePMColor; } private: - GrXferProcessor::OptFlags onGetOptimizations(const GrPipelineOptimizations& optimizations, + GrXferProcessor::OptFlags onGetOptimizations(const GrPipelineAnalysis&, bool doesStencilWrite, GrColor* overrideColor, const GrCaps& caps) const override; @@ -247,12 +247,11 @@ void ArithmeticXP::onGetGLSLProcessorKey(const GrShaderCaps& caps, GrProcessorKe GrGLSLXferProcessor* ArithmeticXP::createGLSLInstance() const { return new GLArithmeticXP(*this); } -GrXferProcessor::OptFlags ArithmeticXP::onGetOptimizations( - const GrPipelineOptimizations& optimizations, - bool doesStencilWrite, - GrColor* overrideColor, - const GrCaps& caps) const { - return GrXferProcessor::kNone_OptFlags; +GrXferProcessor::OptFlags ArithmeticXP::onGetOptimizations(const GrPipelineAnalysis&, + bool doesStencilWrite, + GrColor* overrideColor, + const GrCaps& caps) const { + return GrXferProcessor::kNone_OptFlags; } /////////////////////////////////////////////////////////////////////////////// @@ -263,11 +262,10 @@ GrArithmeticXPFactory::GrArithmeticXPFactory(float k1, float k2, float k3, float this->initClassID<GrArithmeticXPFactory>(); } -GrXferProcessor* -GrArithmeticXPFactory::onCreateXferProcessor(const GrCaps& caps, - const GrPipelineOptimizations& optimizations, - bool hasMixedSamples, - const DstTexture* dstTexture) const { +GrXferProcessor* GrArithmeticXPFactory::onCreateXferProcessor(const GrCaps& caps, + const GrPipelineAnalysis&, + bool hasMixedSamples, + const DstTexture* dstTexture) const { return new ArithmeticXP(dstTexture, hasMixedSamples, fK1, fK2, fK3, fK4, fEnforcePMColor); } diff --git a/src/effects/SkArithmeticMode_gpu.h b/src/effects/SkArithmeticMode_gpu.h index 8effc8a82d..ffd986bcba 100644 --- a/src/effects/SkArithmeticMode_gpu.h +++ b/src/effects/SkArithmeticMode_gpu.h @@ -88,11 +88,11 @@ private: GrArithmeticXPFactory(float k1, float k2, float k3, float k4, bool enforcePMColor); GrXferProcessor* onCreateXferProcessor(const GrCaps& caps, - const GrPipelineOptimizations& optimizations, + const GrPipelineAnalysis&, bool hasMixedSamples, const DstTexture*) const override; - bool onWillReadDstColor(const GrCaps&, const GrPipelineOptimizations&) const override { + bool onWillReadDstColor(const GrCaps&, const GrPipelineAnalysis&) const override { return true; } |