More GrPipeline cleanup.

Remove CanCombine and AreEqual (unused)

Remove isInitialized() now that pipelines are initialized at creation.

Change-Id: Ibacf81d1f879c7ef9ea91a8f471c3d1df3eb2fed
Reviewed-on: https://skia-review.googlesource.com/29020
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

1 files changed, 0 insertions, 33 deletions

diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h
index 6ff6360adb..aca41c1484 100644
--- a/src/gpu/GrPipeline.h
+++ b/src/gpu/GrPipeline.h
@@ -107,39 +107,6 @@ public:
     GrPipeline(const GrPipeline&) = delete;
     GrPipeline& operator=(const GrPipeline&) = delete;
 
-    /** True if the pipeline has been initialized. */
-    bool isInitialized() const { return SkToBool(fProxy.get()); }
-
-    /// @}
-
-    ///////////////////////////////////////////////////////////////////////////
-    /// @name Comparisons
-
-    /**
-     * Returns true if these pipelines are equivalent.  Coord transforms may be applied either on
-     * the GPU or the CPU. When we apply them on the CPU then the matrices need not agree in order
-     * to combine draws. Therefore we take a param that indicates whether coord transforms should be
-     * compared."
-     */
-    static bool AreEqual(const GrPipeline& a, const GrPipeline& b);
-
-    /**
-     * Allows a GrOp subclass to determine whether two GrOp instances can combine. This is a
-     * stricter test than isEqual because it also considers blend barriers when the two ops'
-     * bounds overlap
-     */
-    static bool CanCombine(const GrPipeline& a, const SkRect& aBounds,
-                           const GrPipeline& b, const SkRect& bBounds,
-                           const GrCaps& caps)  {
-        if (!AreEqual(a, b)) {
-            return false;
-        }
-        if (a.xferBarrierType(caps)) {
-            return !GrRectsTouchOrOverlap(aBounds, bBounds);
-        }
-        return true;
-    }
-
     /// @}
 
     ///////////////////////////////////////////////////////////////////////////