diff options
Diffstat (limited to 'src/gpu/effects/GrBezierEffect.cpp')
-rw-r--r-- | src/gpu/effects/GrBezierEffect.cpp | 70 |
1 files changed, 24 insertions, 46 deletions
diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp index 5872992aac..aaa229df0a 100644 --- a/src/gpu/effects/GrBezierEffect.cpp +++ b/src/gpu/effects/GrBezierEffect.cpp @@ -13,19 +13,16 @@ class GrGLConicEffect : public GrGLGeometryProcessor { public: - GrGLConicEffect(const GrGeometryProcessor&, - const GrBatchTracker&); + GrGLConicEffect(const GrGeometryProcessor&); void onEmitCode(EmitArgs&, GrGPArgs*) override; static inline void GenKey(const GrGeometryProcessor&, - const GrBatchTracker&, const GrGLSLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager& pdman, - const GrPrimitiveProcessor& primProc, - const GrBatchTracker& bt) override { + void setData(const GrGLProgramDataManager& pdman, + const GrPrimitiveProcessor& primProc) override { const GrConicEffect& ce = primProc.cast<GrConicEffect>(); if (!ce.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(ce.viewMatrix())) { @@ -67,8 +64,7 @@ private: typedef GrGLGeometryProcessor INHERITED; }; -GrGLConicEffect::GrGLConicEffect(const GrGeometryProcessor& processor, - const GrBatchTracker& bt) +GrGLConicEffect::GrGLConicEffect(const GrGeometryProcessor& processor) : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor_ILLEGAL), fCoverageScale(0xff) { const GrConicEffect& ce = processor.cast<GrConicEffect>(); fEdgeType = ce.getEdgeType(); @@ -170,7 +166,6 @@ void GrGLConicEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { } void GrGLConicEffect::GenKey(const GrGeometryProcessor& gp, - const GrBatchTracker& bt, const GrGLSLCaps&, GrProcessorKeyBuilder* b) { const GrConicEffect& ce = gp.cast<GrConicEffect>(); @@ -186,15 +181,13 @@ void GrGLConicEffect::GenKey(const GrGeometryProcessor& gp, GrConicEffect::~GrConicEffect() {} -void GrConicEffect::getGLProcessorKey(const GrBatchTracker& bt, - const GrGLSLCaps& caps, +void GrConicEffect::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { - GrGLConicEffect::GenKey(*this, bt, caps, b); + GrGLConicEffect::GenKey(*this, caps, b); } -GrGLPrimitiveProcessor* GrConicEffect::createGLInstance(const GrBatchTracker& bt, - const GrGLSLCaps&) const { - return new GrGLConicEffect(*this, bt); +GrGLPrimitiveProcessor* GrConicEffect::createGLInstance(const GrGLSLCaps&) const { + return new GrGLConicEffect(*this); } GrConicEffect::GrConicEffect(GrColor color, const SkMatrix& viewMatrix, uint8_t coverage, @@ -236,19 +229,16 @@ const GrGeometryProcessor* GrConicEffect::TestCreate(GrProcessorTestData* d) { class GrGLQuadEffect : public GrGLGeometryProcessor { public: - GrGLQuadEffect(const GrGeometryProcessor&, - const GrBatchTracker&); + GrGLQuadEffect(const GrGeometryProcessor&); void onEmitCode(EmitArgs&, GrGPArgs*) override; static inline void GenKey(const GrGeometryProcessor&, - const GrBatchTracker&, const GrGLSLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager& pdman, - const GrPrimitiveProcessor& primProc, - const GrBatchTracker& bt) override { + void setData(const GrGLProgramDataManager& pdman, + const GrPrimitiveProcessor& primProc) override { const GrQuadEffect& qe = primProc.cast<GrQuadEffect>(); if (!qe.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(qe.viewMatrix())) { @@ -290,8 +280,7 @@ private: typedef GrGLGeometryProcessor INHERITED; }; -GrGLQuadEffect::GrGLQuadEffect(const GrGeometryProcessor& processor, - const GrBatchTracker& bt) +GrGLQuadEffect::GrGLQuadEffect(const GrGeometryProcessor& processor) : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor_ILLEGAL), fCoverageScale(0xff) { const GrQuadEffect& ce = processor.cast<GrQuadEffect>(); fEdgeType = ce.getEdgeType(); @@ -378,7 +367,6 @@ void GrGLQuadEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { } void GrGLQuadEffect::GenKey(const GrGeometryProcessor& gp, - const GrBatchTracker& bt, const GrGLSLCaps&, GrProcessorKeyBuilder* b) { const GrQuadEffect& ce = gp.cast<GrQuadEffect>(); @@ -394,15 +382,13 @@ void GrGLQuadEffect::GenKey(const GrGeometryProcessor& gp, GrQuadEffect::~GrQuadEffect() {} -void GrQuadEffect::getGLProcessorKey(const GrBatchTracker& bt, - const GrGLSLCaps& caps, +void GrQuadEffect::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { - GrGLQuadEffect::GenKey(*this, bt, caps, b); + GrGLQuadEffect::GenKey(*this, caps, b); } -GrGLPrimitiveProcessor* GrQuadEffect::createGLInstance(const GrBatchTracker& bt, - const GrGLSLCaps&) const { - return new GrGLQuadEffect(*this, bt); +GrGLPrimitiveProcessor* GrQuadEffect::createGLInstance(const GrGLSLCaps&) const { + return new GrGLQuadEffect(*this); } GrQuadEffect::GrQuadEffect(GrColor color, const SkMatrix& viewMatrix, uint8_t coverage, @@ -445,19 +431,16 @@ const GrGeometryProcessor* GrQuadEffect::TestCreate(GrProcessorTestData* d) { class GrGLCubicEffect : public GrGLGeometryProcessor { public: - GrGLCubicEffect(const GrGeometryProcessor&, - const GrBatchTracker&); + GrGLCubicEffect(const GrGeometryProcessor&); void onEmitCode(EmitArgs&, GrGPArgs*) override; static inline void GenKey(const GrGeometryProcessor&, - const GrBatchTracker&, const GrGLSLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager& pdman, - const GrPrimitiveProcessor& primProc, - const GrBatchTracker& bt) override { + void setData(const GrGLProgramDataManager& pdman, + const GrPrimitiveProcessor& primProc) override { const GrCubicEffect& ce = primProc.cast<GrCubicEffect>(); if (!ce.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(ce.viewMatrix())) { @@ -485,8 +468,7 @@ private: typedef GrGLGeometryProcessor INHERITED; }; -GrGLCubicEffect::GrGLCubicEffect(const GrGeometryProcessor& processor, - const GrBatchTracker&) +GrGLCubicEffect::GrGLCubicEffect(const GrGeometryProcessor& processor) : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor_ILLEGAL) { const GrCubicEffect& ce = processor.cast<GrCubicEffect>(); fEdgeType = ce.getEdgeType(); @@ -604,7 +586,6 @@ void GrGLCubicEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { } void GrGLCubicEffect::GenKey(const GrGeometryProcessor& gp, - const GrBatchTracker& bt, const GrGLSLCaps&, GrProcessorKeyBuilder* b) { const GrCubicEffect& ce = gp.cast<GrCubicEffect>(); @@ -618,15 +599,12 @@ void GrGLCubicEffect::GenKey(const GrGeometryProcessor& gp, GrCubicEffect::~GrCubicEffect() {} -void GrCubicEffect::getGLProcessorKey(const GrBatchTracker& bt, - const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { - GrGLCubicEffect::GenKey(*this, bt, caps, b); +void GrCubicEffect::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { + GrGLCubicEffect::GenKey(*this, caps, b); } -GrGLPrimitiveProcessor* GrCubicEffect::createGLInstance(const GrBatchTracker& bt, - const GrGLSLCaps&) const { - return new GrGLCubicEffect(*this, bt); +GrGLPrimitiveProcessor* GrCubicEffect::createGLInstance(const GrGLSLCaps&) const { + return new GrGLCubicEffect(*this); } GrCubicEffect::GrCubicEffect(GrColor color, const SkMatrix& viewMatrix, |