aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrBatch.h
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@chromium.org>2015-07-16 09:13:50 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-07-16 09:13:51 -0700
commit8cab9a7685e872427e6f0388f149575a9b6016ee (patch)
tree7e9456dfab4ac0def923aef86520e3cb0fcf6c8b /src/gpu/GrBatch.h
parente8d21e8f24aa676765d0ff8f433228665c75cdc2 (diff)
All batches do their own pipeline compare
Diffstat (limited to 'src/gpu/GrBatch.h')
-rw-r--r--src/gpu/GrBatch.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gpu/GrBatch.h b/src/gpu/GrBatch.h
index b77011268b..51c556e737 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 {