From 1ba8cc9193f13a812401e14b8037fdcf3f3acbac Mon Sep 17 00:00:00 2001 From: joshualitt Date: Wed, 13 May 2015 12:24:23 -0700 Subject: removing equality / compute invariant loops from GrGeometryProcessors BUG=skia: Committed: https://skia.googlesource.com/skia/+/ef292a0901205b9785a30daae2c036aa34a970ca Review URL: https://codereview.chromium.org/1111603004 --- src/gpu/GrOvalRenderer.cpp | 60 ---------------------------------------------- 1 file changed, 60 deletions(-) (limited to 'src/gpu/GrOvalRenderer.cpp') diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp index d1891fed31..e6198592eb 100644 --- a/src/gpu/GrOvalRenderer.cpp +++ b/src/gpu/GrOvalRenderer.cpp @@ -174,17 +174,6 @@ public: local->fUsesLocalCoords = init.fUsesLocalCoords; } - bool onCanMakeEqual(const GrBatchTracker& m, - const GrGeometryProcessor& that, - const GrBatchTracker& t) const override { - const BatchTracker& mine = m.cast(); - const BatchTracker& theirs = t.cast(); - return CanCombineLocalMatrices(*this, mine.fUsesLocalCoords, - that, theirs.fUsesLocalCoords) && - CanCombineOutput(mine.fInputColorType, mine.fColor, - theirs.fInputColorType, theirs.fColor); - } - private: CircleEdgeEffect(GrColor color, bool stroke, const SkMatrix& localMatrix) : INHERITED(color, SkMatrix::I(), localMatrix) { @@ -195,15 +184,6 @@ private: fStroke = stroke; } - bool onIsEqual(const GrGeometryProcessor& other) const override { - const CircleEdgeEffect& cee = other.cast(); - return cee.fStroke == fStroke; - } - - void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const override { - out->setUnknownSingleComponent(); - } - struct BatchTracker { GrGPInput fInputColorType; GrColor fColor; @@ -369,17 +349,6 @@ public: local->fUsesLocalCoords = init.fUsesLocalCoords; } - bool onCanMakeEqual(const GrBatchTracker& m, - const GrGeometryProcessor& that, - const GrBatchTracker& t) const override { - const BatchTracker& mine = m.cast(); - const BatchTracker& theirs = t.cast(); - return CanCombineLocalMatrices(*this, mine.fUsesLocalCoords, - that, theirs.fUsesLocalCoords) && - CanCombineOutput(mine.fInputColorType, mine.fColor, - theirs.fInputColorType, theirs.fColor); - } - private: EllipseEdgeEffect(GrColor color, bool stroke, const SkMatrix& localMatrix) : INHERITED(color, SkMatrix::I(), localMatrix) { @@ -392,15 +361,6 @@ private: fStroke = stroke; } - bool onIsEqual(const GrGeometryProcessor& other) const override { - const EllipseEdgeEffect& eee = other.cast(); - return eee.fStroke == fStroke; - } - - void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const override { - out->setUnknownSingleComponent(); - } - struct BatchTracker { GrGPInput fInputColorType; GrColor fColor; @@ -584,17 +544,6 @@ public: local->fUsesLocalCoords = init.fUsesLocalCoords; } - bool onCanMakeEqual(const GrBatchTracker& m, - const GrGeometryProcessor& that, - const GrBatchTracker& t) const override { - const BatchTracker& mine = m.cast(); - const BatchTracker& theirs = t.cast(); - return CanCombineLocalMatrices(*this, mine.fUsesLocalCoords, - that, theirs.fUsesLocalCoords) && - CanCombineOutput(mine.fInputColorType, mine.fColor, - theirs.fInputColorType, theirs.fColor); - } - private: DIEllipseEdgeEffect(GrColor color, const SkMatrix& viewMatrix, Mode mode) : INHERITED(color, viewMatrix) { @@ -607,15 +556,6 @@ private: fMode = mode; } - bool onIsEqual(const GrGeometryProcessor& other) const override { - const DIEllipseEdgeEffect& eee = other.cast(); - return eee.fMode == fMode; - } - - void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const override { - out->setUnknownSingleComponent(); - } - struct BatchTracker { GrGPInput fInputColorType; GrColor fColor; -- cgit v1.2.3