diff options
| author |  egdaniel <egdaniel@google.com> | 2015-02-13 11:07:54 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-13 11:07:54 -0800 |
| commit | 2b816bacc0696f03d88c8060b21eda1e5cc7e8b1 (patch) | |
| tree | aa21d711cc82eed78ccf589d67ed1782a0c3683c /src/effects | |
| parent | 997c6358d94e188b1a7b89a4f86e24cbe0f5a164 (diff) | |
Revert of Use dst copies in porter duffer XP to correctly render certain blends. (patchset #4 id:60001 of https://codereview.chromium.org/914003003/)
Reason for revert:
Failing GLProgramTest passing in stupid coeffs
Original issue's description:
> Use dst copies in porter duffer XP to correctly render certain blends.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/997c6358d94e188b1a7b89a4f86e24cbe0f5a164
TBR=bsalomon@google.com,joshualitt@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/923153003
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/SkArithmeticMode_gpu.cpp | 5 | ||||
| -rw-r--r-- | src/effects/SkArithmeticMode_gpu.h | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/effects/SkArithmeticMode_gpu.cpp b/src/effects/SkArithmeticMode_gpu.cpp index e068c9dc37..469f5b1adb 100644 --- a/src/effects/SkArithmeticMode_gpu.cpp +++ b/src/effects/SkArithmeticMode_gpu.cpp @@ -304,12 +304,11 @@ GrArithmeticXPFactory::GrArithmeticXPFactory(float k1, float k2, float k3, float } GrXferProcessor* -GrArithmeticXPFactory::onCreateXferProcessor(const GrDrawTargetCaps& caps, - const GrProcOptInfo& colorPOI, +GrArithmeticXPFactory::onCreateXferProcessor(const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, const GrDeviceCoordTexture* dstCopy) const { return ArithmeticXP::Create(fK1, fK2, fK3, fK4, fEnforcePMColor, dstCopy, - this->willReadDstColor(caps, colorPOI, coveragePOI)); + this->willReadDstColor(colorPOI, coveragePOI)); } diff --git a/src/effects/SkArithmeticMode_gpu.h b/src/effects/SkArithmeticMode_gpu.h index 546902dd50..822e7bde1e 100644 --- a/src/effects/SkArithmeticMode_gpu.h +++ b/src/effects/SkArithmeticMode_gpu.h @@ -96,13 +96,11 @@ public: private: GrArithmeticXPFactory(float k1, float k2, float k3, float k4, bool enforcePMColor); - GrXferProcessor* onCreateXferProcessor(const GrDrawTargetCaps& caps, - const GrProcOptInfo& colorPOI, + GrXferProcessor* onCreateXferProcessor(const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, const GrDeviceCoordTexture* dstCopy) const SK_OVERRIDE; - bool willReadDstColor(const GrDrawTargetCaps& caps, - const GrProcOptInfo& colorPOI, + bool willReadDstColor(const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI) const SK_OVERRIDE { return true; } |