Index: src/gpu/GrBatch.h |
diff --git a/src/gpu/GrBatch.h b/src/gpu/GrBatch.h |
index b77011268b5a23489deb55b76278a5f0e5620efd..51c556e737a0b6a9a15f23f2db233b86a19e2138 100644 |
--- a/src/gpu/GrBatch.h |
+++ b/src/gpu/GrBatch.h |
@@ -57,10 +57,6 @@ public: |
return false; |
} |
- if (!this->pipeline()->isEqual(*that->pipeline())) { |
- return false; |
- } |
- |
return this->onCombineIfPossible(that); |
} |
@@ -97,6 +93,7 @@ public: |
SkDEBUGCODE(bool isUsed() const { return fUsed; }) |
+ const GrPipeline* pipeline() const { return fPipeline; } |
void setPipeline(const GrPipeline* pipeline) { fPipeline.reset(SkRef(pipeline)); } |
protected: |
@@ -113,8 +110,6 @@ protected: |
return fBounds.joinPossiblyEmptyRect(otherBounds); |
} |
- const GrPipeline* pipeline() const { return fPipeline; } |
- |
/** Helper for rendering instances using an instanced index index buffer. This class creates the |
space for the vertices and flushes the draws to the batch target.*/ |
class InstancedHelper { |