diff options
author | joshualitt <joshualitt@google.com> | 2014-12-10 14:57:50 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-10 14:57:50 -0800 |
commit | 06f019fc0f809db993b03d7beb2fd5b4e0c58160 (patch) | |
tree | 7ae82c603d88fe3bec2257eed19c6b87801bfe3c /src/gpu | |
parent | bd528cdb51c4a64c2daead66f152b4034cebf752 (diff) |
Revert of Fix to set correct output type when blending when we've read dst (patchset #4 id:60001 of https://codereview.chromium.org/791143002/)
Reason for revert:
Breaks DM on windows
Original issue's description:
> Fix to set correct output type when blending when we've read dst
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/733fc2054044377e914559fa4f46db66ab7d9cea
TBR=bsalomon@google.com,egdaniel@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/795783002
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/effects/GrPorterDuffXferProcessor.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp index f27b16c374..097854622d 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp +++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp @@ -68,10 +68,6 @@ public: fsBuilder->codeAppendf("%s = %s * %s;", args.fOutputPrimary, args.fInputColor, args.fInputCoverage); - if (GrPorterDuffXferProcessor::kCombineWithDst_PrimaryOutputType == xp.primaryOutputType()){ - fsBuilder->codeAppendf("%s += (vec4(1.0) - %s) * %s;", args.fOutputPrimary, - args.fInputCoverage, fsBuilder->dstColor()); - } } virtual void setData(const GrGLProgramDataManager&, const GrXferProcessor&) SK_OVERRIDE {}; @@ -79,7 +75,6 @@ public: static void GenKey(const GrProcessor& processor, const GrGLCaps& caps, GrProcessorKeyBuilder* b) { const GrPorterDuffXferProcessor& xp = processor.cast<GrPorterDuffXferProcessor>(); - b->add32(xp.primaryOutputType()); b->add32(xp.secondaryOutputType()); }; @@ -94,7 +89,6 @@ GrPorterDuffXferProcessor::GrPorterDuffXferProcessor(GrBlendCoeff srcBlend, GrBl : fSrcBlend(srcBlend) , fDstBlend(dstBlend) , fBlendConstant(constant) - , fPrimaryOutputType(kModulate_PrimaryOutputType) , fSecondaryOutputType(kNone_SecondaryOutputType) { this->initClassID<GrPorterDuffXferProcessor>(); } @@ -158,10 +152,6 @@ void GrPorterDuffXferProcessor::calcOutputTypes(GrXferProcessor::OptFlags optFla fSecondaryOutputType = kCoverageISC_SecondaryOutputType; fDstBlend = (GrBlendCoeff)GrGpu::kIS2C_GrBlendCoeff; } - } else if (readsDst && - kOne_GrBlendCoeff == fSrcBlend && - kZero_GrBlendCoeff == fDstBlend) { - fPrimaryOutputType = kCombineWithDst_PrimaryOutputType; } } } |