diff options
author | 2015-05-13 12:24:23 -0700 | |
---|---|---|
committer | 2015-05-13 12:24:23 -0700 | |
commit | 1ba8cc9193f13a812401e14b8037fdcf3f3acbac (patch) | |
tree | d9aa3a5c3539cb206503ffdfd88447b2732ab353 /src/gpu/effects/GrBezierEffect.cpp | |
parent | 8a90edc2a58a4f8a4b4da73eb08e943be09538c0 (diff) |
removing equality / compute invariant loops from GrGeometryProcessors
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/ef292a0901205b9785a30daae2c036aa34a970ca
Review URL: https://codereview.chromium.org/1111603004
Diffstat (limited to 'src/gpu/effects/GrBezierEffect.cpp')
-rw-r--r-- | src/gpu/effects/GrBezierEffect.cpp | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp index 041cfd7e44..9ab3a951d6 100644 --- a/src/gpu/effects/GrBezierEffect.cpp +++ b/src/gpu/effects/GrBezierEffect.cpp @@ -200,11 +200,6 @@ GrConicEffect::GrConicEffect(GrColor color, const SkMatrix& viewMatrix, uint8_t kVec4f_GrVertexAttribType)); } -bool GrConicEffect::onIsEqual(const GrGeometryProcessor& other) const { - const GrConicEffect& ce = other.cast<GrConicEffect>(); - return (ce.fEdgeType == fEdgeType); -} - void GrConicEffect::initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const { ConicBatchTracker* local = bt->cast<ConicBatchTracker>(); local->fInputColorType = GetColorInputType(&local->fColor, this->color(), init, false); @@ -212,18 +207,6 @@ void GrConicEffect::initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& i local->fUsesLocalCoords = init.fUsesLocalCoords; } -bool GrConicEffect::onCanMakeEqual(const GrBatchTracker& m, - const GrGeometryProcessor& that, - const GrBatchTracker& t) const { - const ConicBatchTracker& mine = m.cast<ConicBatchTracker>(); - const ConicBatchTracker& theirs = t.cast<ConicBatchTracker>(); - return CanCombineLocalMatrices(*this, mine.fUsesLocalCoords, - that, theirs.fUsesLocalCoords) && - CanCombineOutput(mine.fInputColorType, mine.fColor, - theirs.fInputColorType, theirs.fColor) && - mine.fCoverageScale == theirs.fCoverageScale; -} - ////////////////////////////////////////////////////////////////////////////// GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrConicEffect); @@ -421,11 +404,6 @@ GrQuadEffect::GrQuadEffect(GrColor color, const SkMatrix& viewMatrix, uint8_t co kVec4f_GrVertexAttribType)); } -bool GrQuadEffect::onIsEqual(const GrGeometryProcessor& other) const { - const GrQuadEffect& ce = other.cast<GrQuadEffect>(); - return (ce.fEdgeType == fEdgeType); -} - void GrQuadEffect::initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const { QuadBatchTracker* local = bt->cast<QuadBatchTracker>(); local->fInputColorType = GetColorInputType(&local->fColor, this->color(), init, false); @@ -433,18 +411,6 @@ void GrQuadEffect::initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& in local->fUsesLocalCoords = init.fUsesLocalCoords; } -bool GrQuadEffect::onCanMakeEqual(const GrBatchTracker& m, - const GrGeometryProcessor& that, - const GrBatchTracker& t) const { - const QuadBatchTracker& mine = m.cast<QuadBatchTracker>(); - const QuadBatchTracker& theirs = t.cast<QuadBatchTracker>(); - return CanCombineLocalMatrices(*this, mine.fUsesLocalCoords, - that, theirs.fUsesLocalCoords) && - CanCombineOutput(mine.fInputColorType, mine.fColor, - theirs.fInputColorType, theirs.fColor) && - mine.fCoverageScale == theirs.fCoverageScale; -} - ////////////////////////////////////////////////////////////////////////////// GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrQuadEffect); @@ -663,28 +629,12 @@ GrCubicEffect::GrCubicEffect(GrColor color, const SkMatrix& viewMatrix, kVec4f_GrVertexAttribType)); } -bool GrCubicEffect::onIsEqual(const GrGeometryProcessor& other) const { - const GrCubicEffect& ce = other.cast<GrCubicEffect>(); - return (ce.fEdgeType == fEdgeType); -} - void GrCubicEffect::initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const { CubicBatchTracker* local = bt->cast<CubicBatchTracker>(); local->fInputColorType = GetColorInputType(&local->fColor, this->color(), init, false); local->fUsesLocalCoords = init.fUsesLocalCoords; } -bool GrCubicEffect::onCanMakeEqual(const GrBatchTracker& m, - const GrGeometryProcessor& that, - const GrBatchTracker& t) const { - const CubicBatchTracker& mine = m.cast<CubicBatchTracker>(); - const CubicBatchTracker& theirs = t.cast<CubicBatchTracker>(); - return CanCombineLocalMatrices(*this, mine.fUsesLocalCoords, - that, theirs.fUsesLocalCoords) && - CanCombineOutput(mine.fInputColorType, mine.fColor, - theirs.fInputColorType, theirs.fColor); -} - ////////////////////////////////////////////////////////////////////////////// GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrCubicEffect); |