diff options
author | bsalomon <bsalomon@google.com> | 2015-02-05 14:18:05 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-05 14:18:05 -0800 |
commit | 21b2c53218ab25f4268e3992e51d916076a2a7ee (patch) | |
tree | e7ab5654af36277c137b2b13caf4dc011af760a9 /src/gpu/effects/GrCoverageSetOpXP.cpp | |
parent | f71b4c185768ecbfe60da66025c474035ddae822 (diff) |
Revert of Move DstCopy on gpu into the GrXferProcessor. (patchset #11 id:200001 of https://codereview.chromium.org/885923002/)
Reason for revert:
Testing to see if reverting fixes 10.9 bots.
Original issue's description:
> Move DstCopy on gpu into the GrXferProcessor.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/74a11753604768bf461b80cabb66060e8564d82c
>
> Committed: https://skia.googlesource.com/skia/+/5e1378d0e075a323144ba14e0a4cbcca35eccc69
TBR=joshualitt@google.com,egdaniel@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/901663007
Diffstat (limited to 'src/gpu/effects/GrCoverageSetOpXP.cpp')
-rw-r--r-- | src/gpu/effects/GrCoverageSetOpXP.cpp | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/gpu/effects/GrCoverageSetOpXP.cpp b/src/gpu/effects/GrCoverageSetOpXP.cpp index 7025d20395..fe286f6bf5 100644 --- a/src/gpu/effects/GrCoverageSetOpXP.cpp +++ b/src/gpu/effects/GrCoverageSetOpXP.cpp @@ -21,15 +21,7 @@ public: ~GrGLCoverageSetOpXP() SK_OVERRIDE {} - static void GenKey(const GrProcessor& processor, const GrGLCaps& caps, - GrProcessorKeyBuilder* b) { - const GrCoverageSetOpXP& xp = processor.cast<GrCoverageSetOpXP>(); - uint32_t key = xp.invertCoverage() ? 0x0 : 0x1; - b->add32(key); - }; - -private: - void onEmitCode(const EmitArgs& args) SK_OVERRIDE { + void emitCode(const EmitArgs& args) SK_OVERRIDE { const GrCoverageSetOpXP& xp = args.fXP.cast<GrCoverageSetOpXP>(); GrGLFPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); @@ -40,8 +32,16 @@ private: } } - void onSetData(const GrGLProgramDataManager&, const GrXferProcessor&) SK_OVERRIDE {}; + void setData(const GrGLProgramDataManager&, const GrXferProcessor&) SK_OVERRIDE {}; + static void GenKey(const GrProcessor& processor, const GrGLCaps& caps, + GrProcessorKeyBuilder* b) { + const GrCoverageSetOpXP& xp = processor.cast<GrCoverageSetOpXP>(); + uint32_t key = xp.invertCoverage() ? 0x0 : 0x1; + b->add32(key); + }; + +private: typedef GrGLXferProcessor INHERITED; }; @@ -56,7 +56,7 @@ GrCoverageSetOpXP::GrCoverageSetOpXP(SkRegion::Op regionOp, bool invertCoverage) GrCoverageSetOpXP::~GrCoverageSetOpXP() { } -void GrCoverageSetOpXP::onGetGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const { +void GrCoverageSetOpXP::getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const { GrGLCoverageSetOpXP::GenKey(*this, caps, b); } @@ -179,10 +179,8 @@ GrXPFactory* GrCoverageSetOpXPFactory::Create(SkRegion::Op regionOp, bool invert } } -GrXferProcessor* -GrCoverageSetOpXPFactory::onCreateXferProcessor(const GrProcOptInfo& colorPOI, - const GrProcOptInfo& covPOI, - const GrDeviceCoordTexture* dstCopy) const { +GrXferProcessor* GrCoverageSetOpXPFactory::createXferProcessor(const GrProcOptInfo& /* colorPOI*/, + const GrProcOptInfo& covPOI) const { return GrCoverageSetOpXP::Create(fRegionOp, fInvertCoverage); } |