From 9a3ffdd4449a3c16ecb4285a5aa08839573028a7 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@curious-creature.com>
Date: Mon, 12 Feb 2024 14:07:15 -0800
Subject: [PATCH] 2x speed up when iterating over paths

---
 .idea/androidTestResultsUserPreferences.xml   |   1 +
 README.md                                     |   4 +-
 build.gradle                                  |   2 +-
 gradle.properties                             |   2 +-
 pathway/build.gradle                          |   6 +-
 pathway/src/main/cpp/pathway.cpp              | 125 ++++++++++++------
 .../java/dev/romainguy/graphics/path/Paths.kt |   8 ++
 7 files changed, 102 insertions(+), 46 deletions(-)

diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
index 25fa9ac..1b0beec 100644
--- a/.idea/androidTestResultsUserPreferences.xml
+++ b/.idea/androidTestResultsUserPreferences.xml
@@ -50,6 +50,7 @@
               <option name="preferredColumnWidths">
                 <map>
                   <entry key="Duration" value="90" />
+                  <entry key="Google Pixel 6" value="120" />
                   <entry key="Pixel_5_API_33" value="120" />
                   <entry key="Pixel_5_API_34" value="120" />
                   <entry key="Pixel_7_API_34" value="120" />
diff --git a/README.md b/README.md
index f160a61..b1a7b2d 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'dev.romainguy:pathway:0.17.0'
+    implementation 'dev.romainguy:pathway:0.18.0'
 }
 ```
 
@@ -69,7 +69,7 @@ properly honor the path's fill type.
 ## Iterating over a Path
 
 > [!IMPORTANT]
-> It is preferred to use the new androidx
+> Prefer the new androidx
 > [graphics-path library](https://developer.android.com/jetpack/androidx/releases/graphic) to
 > iterate over paths
 
diff --git a/build.gradle b/build.gradle
index 8ccd3b3..dfb75da 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.2.0"
+        classpath 'com.android.tools.build:gradle:8.2.2'
         classpath "com.vanniktech:gradle-maven-publish-plugin:0.25.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.8.20"
diff --git a/gradle.properties b/gradle.properties
index 094f6b3..cf6af20 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=dev.romainguy
-VERSION_NAME=0.17.0
+VERSION_NAME=0.18.0
 
 SONATYPE_HOST=S01
 RELEASE_SIGNING_ENABLED=true
diff --git a/pathway/build.gradle b/pathway/build.gradle
index 413cddc..8e45a11 100644
--- a/pathway/build.gradle
+++ b/pathway/build.gradle
@@ -11,12 +11,16 @@ android {
     namespace "dev.romainguy.graphics.path"
 
     compileSdk 34
-    ndkVersion '25.1.8937393'
+    ndkVersion '26.2.11394342'
 
     defaultConfig {
         minSdk 21
         targetSdk 34
 
+        ndk {
+            //noinspection ChromeOsAbiSupport
+            abiFilters 'arm64-v8a'
+        }
         externalNativeBuild {
             cmake {
                 cppFlags.addAll(rootProject.ext.cppFlags)
diff --git a/pathway/src/main/cpp/pathway.cpp b/pathway/src/main/cpp/pathway.cpp
index 7700d15..3d13ea0 100644
--- a/pathway/src/main/cpp/pathway.cpp
+++ b/pathway/src/main/cpp/pathway.cpp
@@ -139,47 +139,90 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) {
         jclass pathsClass = env->FindClass(JNI_CLASS_NAME);
         if (pathsClass == nullptr) return JNI_ERR;
 
-        static const JNINativeMethod methods[] = {
-                {
-                    (char*) "createInternalPathIterator",
-                    (char*) "(Landroid/graphics/Path;IF)J",
-                    reinterpret_cast<void*>(createPathIterator)
-                },
-                {
-                    (char*) "destroyInternalPathIterator",
-                    (char*) "(J)V",
-                    reinterpret_cast<void*>(destroyPathIterator)
-                },
-                {
-                    (char*) "internalPathIteratorHasNext",
-                    (char*) "(J)Z",
-                    reinterpret_cast<void*>(pathIteratorHasNext)
-                },
-                {
-                    (char*) "internalPathIteratorNext",
-                    (char*) "(J[FI)I",
-                    reinterpret_cast<void*>(pathIteratorNext)
-                },
-                {
-                    (char*) "internalPathIteratorPeek",
-                    (char*) "(J)I",
-                    reinterpret_cast<void*>(pathIteratorPeek)
-                },
-                {
-                    (char*) "internalPathIteratorRawSize",
-                    (char*) "(J)I",
-                    reinterpret_cast<void*>(pathIteratorRawSize)
-                },
-                {
-                    (char*) "internalPathIteratorSize",
-                    (char*) "(J)I",
-                    reinterpret_cast<void*>(pathIteratorSize)
-                },
-        };
-
-        int result = env->RegisterNatives(
-                pathsClass, methods, sizeof(methods) / sizeof(JNINativeMethod)
-        );
+        jint result;
+
+        const uint32_t apiLevel = android_get_device_api_level();
+        if (apiLevel >= 26) { // Android 8.0
+            static const JNINativeMethod methods[] = {
+                    {
+                            (char *) "createInternalPathIterator",
+                            (char *) "(Landroid/graphics/Path;IF)J",
+                            reinterpret_cast<void *>(createPathIterator)
+                    },
+                    {
+                            (char *) "destroyInternalPathIterator",
+                            (char *) "(J)V",
+                            reinterpret_cast<void *>(destroyPathIterator)
+                    },
+                    {
+                            (char *) "internalPathIteratorHasNext",
+                            (char *) "(J)Z",
+                            reinterpret_cast<void *>(pathIteratorHasNext)
+                    },
+                    {
+                            (char *) "internalPathIteratorNext",
+                            (char *) "(J[FI)I",
+                            reinterpret_cast<void *>(pathIteratorNext)
+                    },
+                    {
+                            (char *) "internalPathIteratorPeek",
+                            (char *) "(J)I",
+                            reinterpret_cast<void *>(pathIteratorPeek)
+                    },
+                    {
+                            (char *) "internalPathIteratorRawSize",
+                            (char *) "(J)I",
+                            reinterpret_cast<void *>(pathIteratorRawSize)
+                    },
+                    {
+                            (char *) "internalPathIteratorSize",
+                            (char *) "(J)I",
+                            reinterpret_cast<void *>(pathIteratorSize)
+                    },
+            };
+
+            result = env->RegisterNatives(
+                    pathsClass, methods, sizeof(methods) / sizeof(JNINativeMethod)
+            );
+        } else {
+            static const JNINativeMethod methods[] = {
+                    {
+                            (char *) "createInternalPathIterator",
+                            (char *) "(Landroid/graphics/Path;IF)J",
+                            reinterpret_cast<void *>(createPathIterator)
+                    },
+                    {
+                            (char *) "destroyInternalPathIterator",
+                            (char *) "!(J)V",
+                            reinterpret_cast<void *>(destroyPathIterator)
+                    },
+                    {
+                            (char *) "internalPathIteratorHasNext",
+                            (char *) "!(J)Z",
+                            reinterpret_cast<void *>(pathIteratorHasNext)
+                    },
+                    {
+                            (char *) "internalPathIteratorNext",
+                            (char *) "!(J[FI)I",
+                            reinterpret_cast<void *>(pathIteratorNext)
+                    },
+                    {
+                            (char *) "internalPathIteratorPeek",
+                            (char *) "!(J)I",
+                            reinterpret_cast<void *>(pathIteratorPeek)
+                    },
+                    {
+                            (char *) "internalPathIteratorRawSize",
+                            (char *) "!(J)I",
+                            reinterpret_cast<void *>(pathIteratorRawSize)
+                    },
+                    {
+                            (char *) "internalPathIteratorSize",
+                            (char *) "!(J)I",
+                            reinterpret_cast<void *>(pathIteratorSize)
+                    },
+            };
+        }
         if (result != JNI_OK) return result;
 
         env->DeleteLocalRef(pathsClass);
diff --git a/pathway/src/main/java/dev/romainguy/graphics/path/Paths.kt b/pathway/src/main/java/dev/romainguy/graphics/path/Paths.kt
index d9022dd..8cf21df 100644
--- a/pathway/src/main/java/dev/romainguy/graphics/path/Paths.kt
+++ b/pathway/src/main/java/dev/romainguy/graphics/path/Paths.kt
@@ -20,6 +20,7 @@ package dev.romainguy.graphics.path
 
 import android.graphics.Path
 import android.graphics.PointF
+import dalvik.annotation.optimization.FastNative
 
 /**
  * A path segment represents a curve (line, cubic, quadratic or conic) or a command inside
@@ -211,6 +212,7 @@ class PathIterator(
      * and fills [points] with the points specific to the segment type. Each pair of floats in
      * the [points] array represents a point for the given segment. The number of pairs of floats
      * depends on the [PathSegment.Type]:
+     *
      * - [Move][PathSegment.Type.Move]: 1 pair (indices 0 to 1)
      * - [Move][PathSegment.Type.Line]: 2 pairs (indices 0 to 3)
      * - [Move][PathSegment.Type.Quadratic]: 3 pairs (indices 0 to 5)
@@ -291,18 +293,24 @@ private external fun createInternalPathIterator(
     path: Path, conicEvaluation: Int, tolerance: Float
 ): Long
 
+@FastNative
 private external fun destroyInternalPathIterator(internalPathIterator: Long)
 
+@FastNative
 private external fun internalPathIteratorHasNext(internalPathIterator: Long): Boolean
 
+@FastNative
 private external fun internalPathIteratorNext(
     internalPathIterator: Long,
     points: FloatArray,
     offset: Int
 ): Int
 
+@FastNative
 private external fun internalPathIteratorPeek(internalPathIterator: Long): Int
 
+@FastNative
 private external fun internalPathIteratorRawSize(internalPathIterator: Long): Int
 
+@FastNative
 private external fun internalPathIteratorSize(internalPathIterator: Long): Int