| Index: src/effects/SkArithmeticMode_gpu.cpp
|
| diff --git a/src/effects/SkArithmeticMode_gpu.cpp b/src/effects/SkArithmeticMode_gpu.cpp
|
| index ebc8293b208db98b7a40edb927201b005defa4ff..d7af9c8ff4ee35706c5a17b35f10fdf9aa775e2f 100644
|
| --- a/src/effects/SkArithmeticMode_gpu.cpp
|
| +++ b/src/effects/SkArithmeticMode_gpu.cpp
|
| @@ -97,8 +97,8 @@ private:
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| -GrArithmeticFP::GrArithmeticFP(float k1, float k2, float k3, float k4, bool enforcePMColor,
|
| - const GrFragmentProcessor* dst)
|
| +GrArithmeticFP::GrArithmeticFP(float k1, float k2, float k3, float k4,
|
| + bool enforcePMColor, const GrFragmentProcessor* dst, GrRenderTarget* dstRT)
|
| : fK1(k1), fK2(k2), fK3(k3), fK4(k4), fEnforcePMColor(enforcePMColor) {
|
| this->initClassID<GrArithmeticFP>();
|
|
|
| @@ -139,7 +139,7 @@ const GrFragmentProcessor* GrArithmeticFP::TestCreate(GrProcessorTestData* d) {
|
| bool enforcePMColor = d->fRandom->nextBool();
|
|
|
| SkAutoTUnref<const GrFragmentProcessor> dst(GrProcessorUnitTest::CreateChildFP(d));
|
| - return new GrArithmeticFP(k1, k2, k3, k4, enforcePMColor, dst);
|
| + return new GrArithmeticFP(k1, k2, k3, k4, enforcePMColor, dst, NULL);
|
| }
|
|
|
| GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrArithmeticFP);
|
| @@ -151,7 +151,7 @@ GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrArithmeticFP);
|
| class ArithmeticXP : public GrXferProcessor {
|
| public:
|
| ArithmeticXP(const DstTexture*, bool hasMixedSamples,
|
| - float k1, float k2, float k3, float k4, bool enforcePMColor);
|
| + float k1, float k2, float k3, float k4, bool enforcePMColor, GrRenderTarget* dst);
|
|
|
| const char* name() const override { return "Arithmetic"; }
|
|
|
| @@ -236,8 +236,8 @@ private:
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| ArithmeticXP::ArithmeticXP(const DstTexture* dstTexture, bool hasMixedSamples,
|
| - float k1, float k2, float k3, float k4, bool enforcePMColor)
|
| - : INHERITED(dstTexture, true, hasMixedSamples)
|
| + float k1, float k2, float k3, float k4, bool enforcePMColor, GrRenderTarget* dst)
|
| + : INHERITED(dstTexture, true, hasMixedSamples, dst)
|
| , fK1(k1)
|
| , fK2(k2)
|
| , fK3(k3)
|
| @@ -273,8 +273,8 @@ GrArithmeticXPFactory::onCreateXferProcessor(const GrCaps& caps,
|
| const GrProcOptInfo& colorPOI,
|
| const GrProcOptInfo& coveragePOI,
|
| bool hasMixedSamples,
|
| - const DstTexture* dstTexture) const {
|
| - return new ArithmeticXP(dstTexture, hasMixedSamples, fK1, fK2, fK3, fK4, fEnforcePMColor);
|
| + const DstTexture* dstTexture, GrRenderTarget* dst) const {
|
| + return new ArithmeticXP(dstTexture, hasMixedSamples, fK1, fK2, fK3, fK4, fEnforcePMColor, dst);
|
| }
|
|
|
|
|
|
|