| Index: src/gpu/effects/GrCustomXfermode.cpp
|
| diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp
|
| index 1fdd3b781ff93c2c8d5b660b3700547535779ad6..3431128b6734e0852337927c3f2a6b7b21fd62fc 100644
|
| --- a/src/gpu/effects/GrCustomXfermode.cpp
|
| +++ b/src/gpu/effects/GrCustomXfermode.cpp
|
| @@ -508,12 +508,12 @@ GrFragmentProcessor* GrCustomXferFP::TestCreate(SkRandom* rand,
|
|
|
| class CustomXP : public GrXferProcessor {
|
| public:
|
| - static GrXferProcessor* Create(SkXfermode::Mode mode, const GrDeviceCoordTexture* dstCopy,
|
| + static GrXferProcessor* Create(SkXfermode::Mode mode, const DstTexture* dstTexture,
|
| bool willReadDstColor) {
|
| if (!GrCustomXfermode::IsSupportedMode(mode)) {
|
| return NULL;
|
| } else {
|
| - return SkNEW_ARGS(CustomXP, (mode, dstCopy, willReadDstColor));
|
| + return SkNEW_ARGS(CustomXP, (mode, dstTexture, willReadDstColor));
|
| }
|
| }
|
|
|
| @@ -534,7 +534,7 @@ public:
|
| }
|
|
|
| private:
|
| - CustomXP(SkXfermode::Mode mode, const GrDeviceCoordTexture* dstCopy, bool willReadDstColor);
|
| + CustomXP(SkXfermode::Mode mode, const DstTexture*, bool willReadDstColor);
|
|
|
| GrXferProcessor::OptFlags onGetOptimizations(const GrProcOptInfo& colorPOI,
|
| const GrProcOptInfo& coveragePOI,
|
| @@ -626,9 +626,8 @@ private:
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| -CustomXP::CustomXP(SkXfermode::Mode mode, const GrDeviceCoordTexture* dstCopy,
|
| - bool willReadDstColor)
|
| - : INHERITED(dstCopy, willReadDstColor),
|
| +CustomXP::CustomXP(SkXfermode::Mode mode, const DstTexture* dstTexture, bool willReadDstColor)
|
| + : INHERITED(dstTexture, willReadDstColor),
|
| fMode(mode),
|
| fHWBlendEquation(static_cast<GrBlendEquation>(-1)) {
|
| this->initClassID<CustomXP>();
|
| @@ -790,8 +789,8 @@ GrXferProcessor*
|
| GrCustomXPFactory::onCreateXferProcessor(const GrDrawTargetCaps& caps,
|
| const GrProcOptInfo& colorPOI,
|
| const GrProcOptInfo& coveragePOI,
|
| - const GrDeviceCoordTexture* dstCopy) const {
|
| - return CustomXP::Create(fMode, dstCopy, this->willReadDstColor(caps, colorPOI, coveragePOI));
|
| + const DstTexture* dstTexture) const {
|
| + return CustomXP::Create(fMode, dstTexture, this->willReadDstColor(caps, colorPOI, coveragePOI));
|
| }
|
|
|
| bool GrCustomXPFactory::willReadDstColor(const GrDrawTargetCaps& caps,
|
|
|