From 47916aa18718b3e3fa7ed0e2c8dc0e45f2142611 Mon Sep 17 00:00:00 2001
From: Brian Salomon <bsalomon@google.com>
Date: Fri, 9 Dec 2022 14:34:30 -0500
Subject: [PATCH] Remove code to work with old SkMesh::Make[Indexed] API.

Test: compiles
Bug: b/20682907
Change-Id: Ia82e8c46b1837c98124a0a25682126adb257bb66
---
 libs/hwui/jni/Mesh.cpp | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/libs/hwui/jni/Mesh.cpp b/libs/hwui/jni/Mesh.cpp
index 7c732d7fdcf2d..7b9a93fe0fbaa 100644
--- a/libs/hwui/jni/Mesh.cpp
+++ b/libs/hwui/jni/Mesh.cpp
@@ -37,16 +37,6 @@ sk_sp<SkMesh::IndexBuffer> genIndexBuffer(JNIEnv* env, jobject buffer, int size,
     return indexBuffer;
 }
 
-// TODO(b/260252882): undefine SK_LEGACY_MESH_MAKE and remove this.
-template <typename T>
-SkMesh get_mesh_from_result(T&& result) {
-#ifdef SK_LEGACY_MESH_MAKE
-    return result;
-#else
-    return result.mesh;
-#endif
-}
-
 static jlong make(JNIEnv* env, jobject, jlong meshSpec, jint mode, jobject vertexBuffer,
                   jboolean isDirect, jint vertexCount, jint vertexOffset, jint left, jint top,
                   jint right, jint bottom) {
@@ -54,8 +44,9 @@ static jlong make(JNIEnv* env, jobject, jlong meshSpec, jint mode, jobject verte
     sk_sp<SkMesh::VertexBuffer> skVertexBuffer =
             genVertexBuffer(env, vertexBuffer, vertexCount * skMeshSpec->stride(), isDirect);
     auto skRect = SkRect::MakeLTRB(left, top, right, bottom);
-    auto mesh = get_mesh_from_result(SkMesh::Make(skMeshSpec, SkMesh::Mode(mode), skVertexBuffer,
-                                                  vertexCount, vertexOffset, nullptr, skRect));
+    auto mesh = SkMesh::Make(skMeshSpec, SkMesh::Mode(mode), skVertexBuffer, vertexCount,
+                             vertexOffset, nullptr, skRect)
+                        .mesh;
     auto meshPtr = std::make_unique<MeshWrapper>(MeshWrapper{mesh, MeshUniformBuilder(skMeshSpec)});
     return reinterpret_cast<jlong>(meshPtr.release());
 }
@@ -70,9 +61,10 @@ static jlong makeIndexed(JNIEnv* env, jobject, jlong meshSpec, jint mode, jobjec
     sk_sp<SkMesh::IndexBuffer> skIndexBuffer =
             genIndexBuffer(env, indexBuffer, indexCount * gIndexByteSize, isIndexDirect);
     auto skRect = SkRect::MakeLTRB(left, top, right, bottom);
-    auto mesh = get_mesh_from_result(SkMesh::MakeIndexed(
-            skMeshSpec, SkMesh::Mode(mode), skVertexBuffer, vertexCount, vertexOffset,
-            skIndexBuffer, indexCount, indexOffset, nullptr, skRect));
+    auto mesh = SkMesh::MakeIndexed(skMeshSpec, SkMesh::Mode(mode), skVertexBuffer, vertexCount,
+                                    vertexOffset, skIndexBuffer, indexCount, indexOffset, nullptr,
+                                    skRect)
+                        .mesh;
     auto meshPtr = std::make_unique<MeshWrapper>(MeshWrapper{mesh, MeshUniformBuilder(skMeshSpec)});
     return reinterpret_cast<jlong>(meshPtr.release());
 }
@@ -81,15 +73,17 @@ static void updateMesh(JNIEnv* env, jobject, jlong meshWrapper, jboolean indexed
     auto wrapper = reinterpret_cast<MeshWrapper*>(meshWrapper);
     auto mesh = wrapper->mesh;
     if (indexed) {
-        wrapper->mesh = get_mesh_from_result(SkMesh::MakeIndexed(
-                sk_ref_sp(mesh.spec()), mesh.mode(), sk_ref_sp(mesh.vertexBuffer()),
-                mesh.vertexCount(), mesh.vertexOffset(), sk_ref_sp(mesh.indexBuffer()),
-                mesh.indexCount(), mesh.indexOffset(), wrapper->builder.fUniforms, mesh.bounds()));
+        wrapper->mesh = SkMesh::MakeIndexed(sk_ref_sp(mesh.spec()), mesh.mode(),
+                                            sk_ref_sp(mesh.vertexBuffer()), mesh.vertexCount(),
+                                            mesh.vertexOffset(), sk_ref_sp(mesh.indexBuffer()),
+                                            mesh.indexCount(), mesh.indexOffset(),
+                                            wrapper->builder.fUniforms, mesh.bounds())
+                                .mesh;
     } else {
-        wrapper->mesh = get_mesh_from_result(
-                SkMesh::Make(sk_ref_sp(mesh.spec()), mesh.mode(), sk_ref_sp(mesh.vertexBuffer()),
-                             mesh.vertexCount(), mesh.vertexOffset(), wrapper->builder.fUniforms,
-                             mesh.bounds()));
+        wrapper->mesh = SkMesh::Make(sk_ref_sp(mesh.spec()), mesh.mode(),
+                                     sk_ref_sp(mesh.vertexBuffer()), mesh.vertexCount(),
+                                     mesh.vertexOffset(), wrapper->builder.fUniforms, mesh.bounds())
+                                .mesh;
     }
 }