aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrPipeline.h
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2016-09-12 08:55:38 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-09-12 08:55:38 -0700
commit7312ff87f64f31d741989a60d993bcaa4bb20523 (patch)
tree47b516a2e9d712289a535186ae3acf41b8b3d60d /src/gpu/GrPipeline.h
parentc2f9ec1f5e4e8e98489cd5ea9356771cf4d8ce13 (diff)
Remove ability to skip coord transform comparison in pipeline comparison.
Diffstat (limited to 'src/gpu/GrPipeline.h')
-rw-r--r--src/gpu/GrPipeline.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h
index 8c2f538e27..6366e8050f 100644
--- a/src/gpu/GrPipeline.h
+++ b/src/gpu/GrPipeline.h
@@ -79,7 +79,7 @@ public:
* 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, bool ignoreCoordTransforms);
+ static bool AreEqual(const GrPipeline& a, const GrPipeline& b);
/**
* Allows a GrBatch subclass to determine whether two GrBatches can combine. This is a stricter
@@ -88,9 +88,8 @@ public:
*/
static bool CanCombine(const GrPipeline& a, const SkRect& aBounds,
const GrPipeline& b, const SkRect& bBounds,
- const GrCaps& caps,
- bool ignoreCoordTransforms = false) {
- if (!AreEqual(a, b, ignoreCoordTransforms)) {
+ const GrCaps& caps) {
+ if (!AreEqual(a, b)) {
return false;
}
if (a.xferBarrierType(caps)) {