Remove SkMesh::Make calls without child params.
The cleanup CLs have landed, so the old calls are no longer
used anywhere:
- cl/568280384
- ag/24854851
Bug: b/40045302
Change-Id: I423a1a649b751befc32b706d444f4bdbaf81ba50
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/760137
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
diff --git a/include/core/SkMesh.h b/include/core/SkMesh.h
index 9f28853..8b78f66 100644
--- a/include/core/SkMesh.h
+++ b/include/core/SkMesh.h
@@ -318,15 +318,6 @@
* vertex buffer was null or uniform data too small).
*/
- // TODO(b/40045302): this form of Make is deprecated; remove existing callers in Android/google3
- static Result Make(sk_sp<SkMeshSpecification>,
- Mode,
- sk_sp<VertexBuffer>,
- size_t vertexCount,
- size_t vertexOffset,
- sk_sp<const SkData> uniforms,
- const SkRect& bounds);
-
// TODO(b/40045302): support for `children` is a work-in-progress
static Result Make(sk_sp<SkMeshSpecification>,
Mode,
@@ -344,18 +335,6 @@
* index buffer was null or uniform data too small).
*/
- // TODO(b/40045302): this form of MakeIndexed is deprecated; remove existing callers
- static Result MakeIndexed(sk_sp<SkMeshSpecification>,
- Mode,
- sk_sp<VertexBuffer>,
- size_t vertexCount,
- size_t vertexOffset,
- sk_sp<IndexBuffer>,
- size_t indexCount,
- size_t indexOffset,
- sk_sp<const SkData> uniforms,
- const SkRect& bounds);
-
// TODO(b/40045302): support for `children` is a work-in-progress
static Result MakeIndexed(sk_sp<SkMeshSpecification>,
Mode,
diff --git a/relnotes/mesh-child-params.md b/relnotes/mesh-child-params.md
index 426d211..737665e 100644
--- a/relnotes/mesh-child-params.md
+++ b/relnotes/mesh-child-params.md
@@ -1,2 +1,2 @@
-`SkMesh::Make` and `SkMesh::MakeIndexed` now accept a span of child effects as a new parameter.
+`SkMesh::Make` and `SkMesh::MakeIndexed` now require a span of child effects as a new parameter.
This functionality is still a work in progress; for now, always pass an empty span.
diff --git a/src/core/SkMesh.cpp b/src/core/SkMesh.cpp
index 670d956..72f7a78 100644
--- a/src/core/SkMesh.cpp
+++ b/src/core/SkMesh.cpp
@@ -698,23 +698,6 @@
size_t vertexCount,
size_t vertexOffset,
sk_sp<const SkData> uniforms,
- const SkRect& bounds) {
- return Make(std::move(spec),
- mode,
- std::move(vb),
- vertexCount,
- vertexOffset,
- std::move(uniforms),
- /*children=*/{},
- bounds);
-}
-
-SkMesh::Result SkMesh::Make(sk_sp<SkMeshSpecification> spec,
- Mode mode,
- sk_sp<VertexBuffer> vb,
- size_t vertexCount,
- size_t vertexOffset,
- sk_sp<const SkData> uniforms,
SkSpan<ChildPtr> children,
const SkRect& bounds) {
SkMesh mesh;
@@ -742,29 +725,6 @@
size_t indexCount,
size_t indexOffset,
sk_sp<const SkData> uniforms,
- const SkRect& bounds) {
- return MakeIndexed(std::move(spec),
- mode,
- std::move(vb),
- vertexCount,
- vertexOffset,
- std::move(ib),
- indexCount,
- indexOffset,
- std::move(uniforms),
- /*children=*/{},
- bounds);
-}
-
-SkMesh::Result SkMesh::MakeIndexed(sk_sp<SkMeshSpecification> spec,
- Mode mode,
- sk_sp<VertexBuffer> vb,
- size_t vertexCount,
- size_t vertexOffset,
- sk_sp<IndexBuffer> ib,
- size_t indexCount,
- size_t indexOffset,
- sk_sp<const SkData> uniforms,
SkSpan<ChildPtr> children,
const SkRect& bounds) {
if (!ib) {
