hide/remove obsolete/tricky SkMatrix methods
Change-Id: Iee399b929e8ca1a7326a326a643539d05e333d81
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260818
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
index 9df3334..9fde479 100644
--- a/src/gpu/ops/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -835,7 +835,7 @@
return CombineResult::kCannotCombine;
}
if (fHelper.usesLocalCoords() &&
- !fPaths[0].fViewMatrix.cheapEqualTo(that->fPaths[0].fViewMatrix)) {
+ !SkMatrixPriv::CheapEqual(fPaths[0].fViewMatrix, that->fPaths[0].fViewMatrix)) {
return CombineResult::kCannotCombine;
}
diff --git a/src/gpu/ops/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
index 0efe526..ab780c7 100644
--- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
@@ -879,7 +879,7 @@
// We go to identity if we don't have perspective
if (this->viewMatrix().hasPerspective() &&
- !this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+ !SkMatrixPriv::CheapEqual(this->viewMatrix(), that->viewMatrix())) {
return CombineResult::kCannotCombine;
}
@@ -894,7 +894,8 @@
return CombineResult::kCannotCombine;
}
- if (fHelper.usesLocalCoords() && !this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+ if (fHelper.usesLocalCoords() && !SkMatrixPriv::CheapEqual(this->viewMatrix(),
+ that->viewMatrix())) {
return CombineResult::kCannotCombine;
}
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index a217d85..5ec6335 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -465,7 +465,7 @@
const SkMatrix& thisFirstMatrix = fGeoData[0].fDrawMatrix;
const SkMatrix& thatFirstMatrix = that->fGeoData[0].fDrawMatrix;
- if (this->usesLocalCoords() && !thisFirstMatrix.cheapEqualTo(thatFirstMatrix)) {
+ if (this->usesLocalCoords() && !SkMatrixPriv::CheapEqual(thisFirstMatrix, thatFirstMatrix)) {
return CombineResult::kCannotCombine;
}
diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp
index 1707e19..522b094 100644
--- a/src/gpu/ops/GrDashOp.cpp
+++ b/src/gpu/ops/GrDashOp.cpp
@@ -665,7 +665,7 @@
return CombineResult::kCannotCombine;
}
- if (fUsesLocalCoords && !this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+ if (fUsesLocalCoords && !SkMatrixPriv::CheapEqual(this->viewMatrix(), that->viewMatrix())) {
return CombineResult::kCannotCombine;
}
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index 492bf65..ddbb809 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -464,7 +464,7 @@
return CombineResult::kCannotCombine;
}
- if (!this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+ if (!SkMatrixPriv::CheapEqual(this->viewMatrix(), that->viewMatrix())) {
return CombineResult::kCannotCombine;
}
diff --git a/src/gpu/ops/GrDrawAtlasOp.cpp b/src/gpu/ops/GrDrawAtlasOp.cpp
index 2d0f812..13df23a 100644
--- a/src/gpu/ops/GrDrawAtlasOp.cpp
+++ b/src/gpu/ops/GrDrawAtlasOp.cpp
@@ -229,7 +229,7 @@
}
// We currently use a uniform viewmatrix for this op.
- if (!this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+ if (!SkMatrixPriv::CheapEqual(this->viewMatrix(), that->viewMatrix())) {
return CombineResult::kCannotCombine;
}
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp
index d3abf61..370731a 100644
--- a/src/gpu/ops/GrDrawVerticesOp.cpp
+++ b/src/gpu/ops/GrDrawVerticesOp.cpp
@@ -563,7 +563,7 @@
}
// Check whether we are about to acquire a mesh with a different view matrix.
if (!this->hasMultipleViewMatrices() &&
- !this->fMeshes[0].fViewMatrix.cheapEqualTo(that->fMeshes[0].fViewMatrix)) {
+ !SkMatrixPriv::CheapEqual(this->fMeshes[0].fViewMatrix, that->fMeshes[0].fViewMatrix)) {
fFlags |= kHasMultipleViewMatrices_Flag;
}
diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index d73b06d..eea698f 100644
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -871,7 +871,9 @@
const CoordTransformRange& transformRange) override {
const DIEllipseGeometryProcessor& diegp = gp.cast<DIEllipseGeometryProcessor>();
- if (!diegp.fViewMatrix.isIdentity() && !fViewMatrix.cheapEqualTo(diegp.fViewMatrix)) {
+ if (!diegp.fViewMatrix.isIdentity() &&
+ !SkMatrixPriv::CheapEqual(fViewMatrix, diegp.fViewMatrix))
+ {
fViewMatrix = diegp.fViewMatrix;
float viewMatrix[3 * 3];
GrGLSLGetMatrix<3>(viewMatrix, fViewMatrix);
@@ -1422,7 +1424,8 @@
}
if (fHelper.usesLocalCoords() &&
- !fViewMatrixIfUsingLocalCoords.cheapEqualTo(that->fViewMatrixIfUsingLocalCoords)) {
+ !SkMatrixPriv::CheapEqual(fViewMatrixIfUsingLocalCoords,
+ that->fViewMatrixIfUsingLocalCoords)) {
return CombineResult::kCannotCombine;
}
@@ -1717,7 +1720,8 @@
}
if (fHelper.usesLocalCoords() &&
- !fViewMatrixIfUsingLocalCoords.cheapEqualTo(that->fViewMatrixIfUsingLocalCoords)) {
+ !SkMatrixPriv::CheapEqual(fViewMatrixIfUsingLocalCoords,
+ that->fViewMatrixIfUsingLocalCoords)) {
return CombineResult::kCannotCombine;
}
@@ -1975,7 +1979,8 @@
}
if (fHelper.usesLocalCoords() &&
- !fViewMatrixIfUsingLocalCoords.cheapEqualTo(that->fViewMatrixIfUsingLocalCoords)) {
+ !SkMatrixPriv::CheapEqual(fViewMatrixIfUsingLocalCoords,
+ that->fViewMatrixIfUsingLocalCoords)) {
return CombineResult::kCannotCombine;
}
@@ -2215,7 +2220,7 @@
}
// TODO rewrite to allow positioning on CPU
- if (!this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+ if (!SkMatrixPriv::CheapEqual(this->viewMatrix(), that->viewMatrix())) {
return CombineResult::kCannotCombine;
}
@@ -2652,7 +2657,8 @@
}
if (fHelper.usesLocalCoords() &&
- !fViewMatrixIfUsingLocalCoords.cheapEqualTo(that->fViewMatrixIfUsingLocalCoords)) {
+ !SkMatrixPriv::CheapEqual(fViewMatrixIfUsingLocalCoords,
+ that->fViewMatrixIfUsingLocalCoords)) {
return CombineResult::kCannotCombine;
}
@@ -2937,7 +2943,8 @@
}
if (fHelper.usesLocalCoords() &&
- !fViewMatrixIfUsingLocalCoords.cheapEqualTo(that->fViewMatrixIfUsingLocalCoords)) {
+ !SkMatrixPriv::CheapEqual(fViewMatrixIfUsingLocalCoords,
+ that->fViewMatrixIfUsingLocalCoords)) {
return CombineResult::kCannotCombine;
}
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index 15f8435..c5e8f8e 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -843,7 +843,7 @@
// We can position on the cpu unless we're in perspective,
// but also need to make sure local matrices are identical
if ((thisCtm.hasPerspective() || fHelper.usesLocalCoords()) &&
- !thisCtm.cheapEqualTo(thatCtm)) {
+ !SkMatrixPriv::CheapEqual(thisCtm, thatCtm)) {
return CombineResult::kCannotCombine;
}
diff --git a/src/gpu/ops/GrStrokeRectOp.cpp b/src/gpu/ops/GrStrokeRectOp.cpp
index 83f6eee..db60858 100644
--- a/src/gpu/ops/GrStrokeRectOp.cpp
+++ b/src/gpu/ops/GrStrokeRectOp.cpp
@@ -640,7 +640,9 @@
// We apply the viewmatrix to the rect points on the cpu. However, if the pipeline uses
// local coords then we won't be able to combine. TODO: Upload local coords as an attribute.
- if (fHelper.usesLocalCoords() && !this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+ if (fHelper.usesLocalCoords() &&
+ !SkMatrixPriv::CheapEqual(this->viewMatrix(), that->viewMatrix()))
+ {
return CombineResult::kCannotCombine;
}