@shopify/react-native-skia 2.13.0 → 2.14.0

package/cpp/api/JsiSkSurfaceFactory.h

@@ -10,6 +10,10 @@
 
 #include "JsiSkSurface.h"
 
+#ifdef SK_GRAPHITE
+#include "rnskia/RNDawnContext.h"
+#endif
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
@@ -59,12 +63,49 @@ public:
                                       getContext(), std::move(surface)));
   }
 
+  // Pointer-based texture interop with react-native-webgpu, the surface
+  // counterpart of JsiSkImageFactory::MakeImageFromNativeTexture: Skia draws
+  // directly into a texture created on the shared device, so WebGPU can
+  // sample what Skia drew without any copy.
+  JSI_HOST_FUNCTION(MakeFromNativeTexture) {
+#ifdef SK_GRAPHITE
+    if (count < 1 || !arguments[0].isBigInt()) {
+      throw std::runtime_error("MakeFromNativeTexture requires a WGPUTexture "
+                               "pointer (BigInt), e.g. texture.nativePointer");
+    }
+    auto raw = reinterpret_cast<WGPUTexture>(
+        arguments[0].asBigInt(runtime).asUint64(runtime));
+    if (raw == nullptr) {
+      throw std::runtime_error(
+          "MakeFromNativeTexture: pointer must be non-null");
+    }
+    // AddRef so our wgpu::Texture holds its own reference: the surface keeps
+    // the texture alive for its lifetime, and the JS GPUTexture keeps its own
+    // reference, which the caller may release once the surface exists.
+    wgpuTextureAddRef(raw);
+    wgpu::Texture texture = wgpu::Texture::Acquire(raw);
+    auto surface = DawnContext::getInstance().MakeSurfaceFromTexture(texture);
+    if (surface == nullptr) {
+      throw std::runtime_error(
+          "MakeFromNativeTexture: failed to wrap the texture");
+    }
+    return makeJsiObject(runtime, std::make_shared<JsiSkSurface>(
+                                      getContext(), std::move(surface)));
+#else
+    throw std::runtime_error(
+        "MakeFromNativeTexture is only available with the Graphite backend. "
+        "Rebuild with SK_GRAPHITE enabled.");
+#endif
+  }
+
   size_t getMemoryPressure() override { return 2048; }
 
   static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
     installMethod(runtime, prototype, "Make", &JsiSkSurfaceFactory::Make);
     installHostMethod(runtime, prototype, "MakeOffscreen",
                       &JsiSkSurfaceFactory::MakeOffscreen);
+    installHostMethod(runtime, prototype, "MakeFromNativeTexture",
+                      &JsiSkSurfaceFactory::MakeFromNativeTexture);
   }
 
   explicit JsiSkSurfaceFactory(std::shared_ptr<RNSkPlatformContext> context)

package/cpp/api/recorder/Command.h

@@ -55,7 +55,7 @@ public:
   CommandType type;
   std::string nodeType;
 
-  Command(CommandType t) : type(t) {}
+  explicit Command(CommandType t) : type(t) {}
   Command(CommandType t, std::string nodeT) : type(t), nodeType(nodeT) {}
   virtual ~Command() = default;
 };