diff options
author | 2015-02-13 11:07:54 -0800 | |
---|---|---|
committer | 2015-02-13 11:07:54 -0800 | |
commit | 2b816bacc0696f03d88c8060b21eda1e5cc7e8b1 (patch) | |
tree | aa21d711cc82eed78ccf589d67ed1782a0c3683c /src/gpu/GrXferProcessor.cpp | |
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/gpu/GrXferProcessor.cpp')
-rw-r--r-- | src/gpu/GrXferProcessor.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gpu/GrXferProcessor.cpp b/src/gpu/GrXferProcessor.cpp index 358a249060..321dcfd5e8 100644 --- a/src/gpu/GrXferProcessor.cpp +++ b/src/gpu/GrXferProcessor.cpp @@ -38,7 +38,7 @@ GrXferProcessor* GrXPFactory::createXferProcessor(const GrProcOptInfo& colorPOI, const GrDeviceCoordTexture* dstCopy, const GrDrawTargetCaps& caps) const { #ifdef SK_DEBUG - if (this->willReadDstColor(caps, colorPOI, coveragePOI)) { + if (this->willReadDstColor(colorPOI, coveragePOI)) { if (!caps.dstReadInShaderSupport()) { SkASSERT(dstCopy && dstCopy->texture()); } else { @@ -46,13 +46,14 @@ GrXferProcessor* GrXPFactory::createXferProcessor(const GrProcOptInfo& colorPOI, } } else { SkASSERT(!dstCopy || !dstCopy->texture()); + } #endif - return this->onCreateXferProcessor(caps, colorPOI, coveragePOI, dstCopy); + return this->onCreateXferProcessor(colorPOI, coveragePOI, dstCopy); } bool GrXPFactory::willNeedDstCopy(const GrDrawTargetCaps& caps, const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI) const { - return (this->willReadDstColor(caps, colorPOI, coveragePOI) && !caps.dstReadInShaderSupport()); + return (this->willReadDstColor(colorPOI, coveragePOI) && !caps.dstReadInShaderSupport()); } |