@shopify/react-native-skia 2.9.1 → 2.10.1

package/android/CMakeLists.txt

@@ -70,6 +70,7 @@ if(SK_GRAPHITE)
     set(BACKEND_SOURCES
     #TODO: is this source needed to be added?
         "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNDawnWindowContext.cpp"
+        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNDawnInterop.cpp"
     )
 else()
     add_definitions(-DSK_GL -DSK_GANESH)
@@ -99,10 +100,10 @@ add_library(
         "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/AHardwareBufferUtils.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/RNSkAndroidVideo.cpp"
 
-        "${PROJECT_SOURCE_DIR}/../cpp/jsi/JsiHostObject.cpp"
         "${PROJECT_SOURCE_DIR}/../cpp/jsi/RuntimeLifecycleMonitor.cpp"
         "${PROJECT_SOURCE_DIR}/../cpp/jsi/RuntimeAwareCache.cpp"
         "${PROJECT_SOURCE_DIR}/../cpp/jsi/JsiPromises.cpp"
+        "${PROJECT_SOURCE_DIR}/../cpp/jsi/Promise.cpp"
 
         "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNSkManager.cpp"
 
@@ -114,42 +115,6 @@ add_library(
         ${BACKEND_SOURCES}
 )
 
-if(SK_GRAPHITE)
-    # WebGPU JSI infrastructure (jsi2)
-    target_sources(${PACKAGE_NAME} PRIVATE
-        "${PROJECT_SOURCE_DIR}/../cpp/jsi2/Promise.cpp"
-
-        # WebGPU async system
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/async/AsyncTaskHandle.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/async/RuntimeContext.cpp"
-
-        # WebGPU API
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPU.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUAdapter.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUBindGroup.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUBuffer.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUCanvasContext.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUCommandEncoder.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUComputePassEncoder.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUComputePipeline.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUDevice.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUDeviceLostInfo.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUExternalTexture.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUQuerySet.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUQueue.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPURenderBundleEncoder.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPURenderPassEncoder.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPURenderPipeline.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUShaderModule.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUSharedFence.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUSharedTextureMemory.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUSupportedLimits.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnwgpu/api/GPUTexture.cpp"
-
-        # WebGPU Canvas JNI bindings
-        "${PROJECT_SOURCE_DIR}/cpp/jni/JniWebGPUView.cpp"
-    )
-endif()
 
 
 target_include_directories(
@@ -179,13 +144,8 @@ target_include_directories(
         ../cpp/rnskia/values
         ../cpp/utils
 
-        # WebGPU bindings
+        # Shared JSI infrastructure (cpp/jsi) via prefix-qualified includes
         ../cpp
-        ../cpp/jsi2
-        ../cpp/rnwgpu
-        ../cpp/rnwgpu/api
-        ../cpp/rnwgpu/api/descriptors
-        ../cpp/rnwgpu/async
 
         ${libfbjni_include_DIRS}
 )
@@ -218,8 +178,10 @@ add_library(jsonreader STATIC IMPORTED)
 set_property(TARGET jsonreader PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libjsonreader.a")
 
 if(SK_GRAPHITE)
-    add_library(dawn_combined STATIC IMPORTED)
-    set_property(TARGET dawn_combined PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libdawn_combined.a")
+    # Dawn is a shared library, the same artifact react-native-webgpu links, so
+    # an app that installs both packages loads exactly one Dawn copy.
+    add_library(webgpu_dawn SHARED IMPORTED)
+    set_property(TARGET webgpu_dawn PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libwebgpu_dawn.so")
 endif()
 
 find_library(
@@ -394,7 +356,7 @@ endif()
 if(SK_GRAPHITE)
     target_link_libraries(${PACKAGE_NAME}
         ${COMMON_LIBS}
-        dawn_combined
+        webgpu_dawn
     )
 else()
     target_link_libraries(${PACKAGE_NAME}

package/android/build.gradle

@@ -88,6 +88,39 @@ def skiaLibsPath = useGraphite
         : "${resolveNodePackage('react-native-skia-graphite-android', projectDir)}/libs")
     : "${resolveNodePackage('react-native-skia-android', projectDir)}/libs"
 
+// Both packages must link the exact same Dawn artifact: compare this
+// Graphite build's Dawn release tag (libs/.dawn-version) with the tag
+// react-native-webgpu declares in its package.json `dawn` field.
+if (useGraphite) {
+    def dawnMarker = file("${projectDir}/../libs/.dawn-version")
+    def webgpuDir = null
+    try {
+        webgpuDir = resolveNodePackage('react-native-webgpu', projectDir)
+    } catch (Exception ignored) {
+        // react-native-webgpu not installed: nothing to check
+    }
+    if (dawnMarker.exists() && webgpuDir != null) {
+        def skiaDawn = dawnMarker.text.trim()
+        def webgpuJson = new groovy.json.JsonSlurper().parse(file("${webgpuDir}/package.json"))
+        if (webgpuJson.dawn == null) {
+            throw new GradleException(
+                "react-native-skia: the installed react-native-webgpu " +
+                "(${webgpuJson.version}) does not declare a `dawn` field in its " +
+                "package.json, so it predates shared-Dawn support and cannot be " +
+                "paired with this Graphite build (which links ${skiaDawn}). " +
+                "Upgrade react-native-webgpu.")
+        }
+        def webgpuDawn = "dawn-" + webgpuJson.dawn.toString().replace('/', '-')
+        if (skiaDawn != webgpuDawn) {
+            throw new GradleException(
+                "react-native-skia: Dawn version mismatch. This Graphite build links " +
+                "${skiaDawn} but react-native-webgpu links ${webgpuDawn}. " +
+                "Align the two packages so the app contains exactly one Dawn.")
+        }
+        logger.warn("react-native-skia: Dawn versions match (${skiaDawn})")
+    }
+}
+
 logger.warn("react-native-skia: SK_GRAPHITE: ${useGraphite}")
 logger.warn("react-native-skia: Skia libs: ${skiaLibsPath}")
 logger.warn("react-native-skia: node_modules/ found at: ${nodeModules}")

package/android/src/main/java/com/shopify/reactnative/skia/RNSkiaPackage.java

@@ -43,8 +43,7 @@ public class RNSkiaPackage extends TurboReactPackage {
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
         return Arrays.<ViewManager>asList(
-            new SkiaPictureViewManager(),
-            new WebGPUViewManager()
+            new SkiaPictureViewManager()
         );
     }
 

package/cpp/api/JsiNativeBuffer.h

@@ -6,6 +6,7 @@
 #include <jsi/jsi.h>
 
 #include "JsiSkImage.h"
+#include "JsiSkNativeObjects.h"
 
 namespace RNSkia {
 
@@ -15,43 +16,41 @@ namespace jsi = facebook::jsi;
  Implementation of the ParagraphBuilderFactory for making ParagraphBuilder JSI
  object
  */
-class JsiNativeBufferFactory : public JsiSkHostObject {
+class JsiNativeBufferFactory
+    : public JsiSkNativeObject<JsiNativeBufferFactory> {
 public:
-  JSI_HOST_FUNCTION(MakeFromImage) {
-    auto image = JsiSkImage::fromValue(runtime, arguments[0]);
+  static constexpr const char *CLASS_NAME = "NativeBufferFactory";
+
+  // Native buffer pointers travel as BigInts, which the void* converter
+  // produces/consumes.
+  void *MakeFromImage(sk_sp<SkImage> image) {
     image->makeNonTextureImage();
     uint64_t pointer = getContext()->makeNativeBuffer(image);
-    return jsi::BigInt::fromUint64(runtime, pointer);
+    return reinterpret_cast<void *>(pointer);
   }
 
-  JSI_HOST_FUNCTION(MakeTestBuffer) {
-    auto width = static_cast<int>(arguments[0].asNumber());
-    auto height = static_cast<int>(arguments[1].asNumber());
+  void *MakeTestBuffer(int width, int height) {
     uint64_t pointer = getContext()->makeTestNativeBuffer(width, height);
-    return jsi::BigInt::fromUint64(runtime, pointer);
+    return reinterpret_cast<void *>(pointer);
   }
 
-  JSI_HOST_FUNCTION(Release) {
-
-    jsi::BigInt pointer = arguments[0].asBigInt(runtime);
-    const uintptr_t nativeBufferPointer = pointer.asUint64(runtime);
-
-    getContext()->releaseNativeBuffer(nativeBufferPointer);
-    return jsi::Value::undefined();
+  void Release(void *pointer) {
+    getContext()->releaseNativeBuffer(reinterpret_cast<uintptr_t>(pointer));
   }
 
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiNativeBufferFactory, Release),
-                       JSI_EXPORT_FUNC(JsiNativeBufferFactory, MakeFromImage),
-                       JSI_EXPORT_FUNC(JsiNativeBufferFactory, MakeTestBuffer))
-
-  size_t getMemoryPressure() const override { return 1024; }
-
-  std::string getObjectType() const override {
-    return "JsiNativeBufferFactory";
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installMethod(runtime, prototype, "Release",
+                  &JsiNativeBufferFactory::Release);
+    installMethod(runtime, prototype, "MakeFromImage",
+                  &JsiNativeBufferFactory::MakeFromImage);
+    installMethod(runtime, prototype, "MakeTestBuffer",
+                  &JsiNativeBufferFactory::MakeTestBuffer);
   }
 
+  size_t getMemoryPressure() override { return 1024; }
+
   explicit JsiNativeBufferFactory(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiSkHostObject(std::move(context)) {}
+      : JsiSkNativeObject<JsiNativeBufferFactory>(std::move(context)) {}
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkAnimatedImage.h

@@ -7,7 +7,7 @@
 #include <string>
 #include <utility>
 
-#include "JsiSkHostObjects.h"
+#include "JsiSkNativeObjects.h"
 #include "api/third_party/base64.h"
 
 #pragma clang diagnostic push
@@ -29,44 +29,45 @@ namespace RNSkia {
 namespace jsi = facebook::jsi;
 
 class JsiSkAnimatedImage
-    : public JsiSkWrappingSkPtrHostObject<SkAnimatedImage> {
+    : public JsiSkWrappingSkPtrNativeObject<JsiSkAnimatedImage,
+                                            SkAnimatedImage> {
 public:
+  static constexpr const char *CLASS_NAME = "AnimatedImage";
+
   // TODO-API: Properties?
-  JSI_HOST_FUNCTION(getCurrentFrame) {
+  std::shared_ptr<JsiSkImage> getCurrentFrame() {
     auto image = getObject()->getCurrentFrame();
-    auto hostObjectInstance =
-        std::make_shared<JsiSkImage>(getContext(), std::move(image));
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
-        runtime, hostObjectInstance, getContext());
+    return std::make_shared<JsiSkImage>(getContext(), std::move(image));
   }
 
-  JSI_HOST_FUNCTION(getFrameCount) {
-    return static_cast<int>(getObject()->getFrameCount());
-  }
+  int getFrameCount() { return static_cast<int>(getObject()->getFrameCount()); }
 
-  JSI_HOST_FUNCTION(currentFrameDuration) {
+  int currentFrameDuration() {
     return static_cast<int>(getObject()->currentFrameDuration());
   }
 
-  JSI_HOST_FUNCTION(decodeNextFrame) {
+  int decodeNextFrame() {
     return static_cast<int>(getObject()->decodeNextFrame());
   }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkAnimatedImage, AnimatedImage)
-
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkAnimatedImage, dispose),
-                       JSI_EXPORT_FUNC(JsiSkAnimatedImage, getFrameCount),
-                       JSI_EXPORT_FUNC(JsiSkAnimatedImage, getCurrentFrame),
-                       JSI_EXPORT_FUNC(JsiSkAnimatedImage,
-                                       currentFrameDuration),
-                       JSI_EXPORT_FUNC(JsiSkAnimatedImage, decodeNextFrame))
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installCommon(runtime, prototype);
+    installMethod(runtime, prototype, "getFrameCount",
+                  &JsiSkAnimatedImage::getFrameCount);
+    installMethod(runtime, prototype, "getCurrentFrame",
+                  &JsiSkAnimatedImage::getCurrentFrame);
+    installMethod(runtime, prototype, "currentFrameDuration",
+                  &JsiSkAnimatedImage::currentFrameDuration);
+    installMethod(runtime, prototype, "decodeNextFrame",
+                  &JsiSkAnimatedImage::decodeNextFrame);
+  }
 
   JsiSkAnimatedImage(std::shared_ptr<RNSkPlatformContext> context,
                      const sk_sp<SkAnimatedImage> image)
-      : JsiSkWrappingSkPtrHostObject<SkAnimatedImage>(std::move(context),
-                                                      std::move(image)) {}
+      : JsiSkWrappingSkPtrNativeObject<JsiSkAnimatedImage, SkAnimatedImage>(
+            std::move(context), std::move(image)) {}
 
-  size_t getMemoryPressure() const override {
+  size_t getMemoryPressure() override {
     auto animation = getObject();
     if (!animation) {
       return 0;
@@ -131,8 +132,6 @@ public:
 
     return estimated;
   }
-
-  std::string getObjectType() const override { return "JsiSkAnimatedImage"; }
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkAnimatedImageFactory.h

@@ -2,45 +2,46 @@
 
 #include <memory>
 #include <utility>
+#include <variant>
 
 #include <jsi/jsi.h>
 
-#include "jsi/JsiPromises.h"
 #include "JsiSkAnimatedImage.h"
+#include "JsiSkConverters.h"
 #include "JsiSkData.h"
-#include "JsiSkHostObjects.h"
+#include "JsiSkNativeObjects.h"
+#include "jsi/JsiPromises.h"
 
 namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkAnimatedImageFactory : public JsiSkHostObject {
+class JsiSkAnimatedImageFactory
+    : public JsiSkNativeObject<JsiSkAnimatedImageFactory> {
 public:
-  JSI_HOST_FUNCTION(MakeAnimatedImageFromEncoded) {
-    auto data = JsiSkData::fromValue(runtime, arguments[0]);
+  static constexpr const char *CLASS_NAME = "AnimatedImageFactory";
+
+  std::variant<std::nullptr_t, std::shared_ptr<JsiSkAnimatedImage>>
+  MakeAnimatedImageFromEncoded(sk_sp<SkData> data) {
     auto codec = SkAndroidCodec::MakeFromData(data);
     auto image = SkAnimatedImage::Make(std::move(codec));
     if (image == nullptr) {
-      return jsi::Value::null();
+      return nullptr;
     }
-    auto hostObjectInstance =
-        std::make_shared<JsiSkAnimatedImage>(getContext(), std::move(image));
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
-        runtime, hostObjectInstance, getContext());
+    return std::make_shared<JsiSkAnimatedImage>(getContext(),
+                                                std::move(image));
   }
 
-  size_t getMemoryPressure() const override { return 1024; }
+  size_t getMemoryPressure() override { return 1024; }
 
-  std::string getObjectType() const override {
-    return "JsiSkAnimatedImageFactory";
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installMethod(runtime, prototype, "MakeAnimatedImageFromEncoded",
+                  &JsiSkAnimatedImageFactory::MakeAnimatedImageFromEncoded);
   }
 
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkAnimatedImageFactory,
-                                       MakeAnimatedImageFromEncoded))
-
   explicit JsiSkAnimatedImageFactory(
       std::shared_ptr<RNSkPlatformContext> context)
-      : JsiSkHostObject(std::move(context)) {}
+      : JsiSkNativeObject<JsiSkAnimatedImageFactory>(std::move(context)) {}
 };
 
 } // namespace RNSkia