@shopify/react-native-skia 1.6.0 → 1.7.1

package/src/skia/types/Image/Image.ts

@@ -48,6 +48,17 @@ export interface SkImage extends SkJSIInstance<"Image"> {
    */
   getImageInfo(): ImageInfo;
 
+  /**
+   * Returns the backend texture of the image.
+   * The returned object can be used to create a Skia Image object.
+   * The returned object is backend specific and should be used with caution.
+   * It is the caller's responsibility to ensure that the texture is not used after the image is deleted.
+   * The returned object may be null if the image does not have a backend texture.
+   *
+   * @return backend texture of the image or null
+   */
+  getNativeTextureUnstable(): unknown;
+
   /**
    * Returns this image as a shader with the specified tiling. It will use cubic sampling.
    * @param tx - tile mode in the x direction.

package/src/skia/types/Image/ImageFactory.ts

@@ -49,6 +49,30 @@ export interface ImageFactory {
    */
   MakeImageFromNativeBuffer: (nativeBuffer: NativeBuffer) => SkImage;
 
+  /**
+   *
+   * Return an Image backed by a given native texture.
+   *
+   * The native texture must be a valid owning reference.
+   *
+   * This API might be used to integrate with other libraries using gpu textures,
+   * or to transfer images between different threads.
+   *
+   * @param texture A native texture handle
+   * @param width The width of the texture
+   * @param height The height of the texture
+   * @param mipmapped Whether the texture is mipmapped
+   * @throws Throws an error if the Image could not be created, for example when the given native texture is invalid.
+   *
+   * @returns Returns a valid SkImage, if the texture is invalid, an error is thrown.
+   */
+  MakeImageFromNativeTextureUnstable: (
+    texture: unknown,
+    width: number,
+    height: number,
+    mipmapped?: boolean
+  ) => SkImage;
+
   /**
    * Returns an image that will be a screenshot of the view represented by
    * the view tag

package/src/skia/types/Matrix4.ts

@@ -370,3 +370,104 @@ export const convertToAffineMatrix = (m4: Matrix4) => {
   // Returning the 6-element affine transformation matrix
   return [a, b, c, d, tx, ty];
 };
+
+/**
+ * Calculates the determinant of a 3x3 matrix
+ * @worklet
+ */
+const det3x3 = (
+  a00: number,
+  a01: number,
+  a02: number,
+  a10: number,
+  a11: number,
+  a12: number,
+  a20: number,
+  a21: number,
+  a22: number
+): number => {
+  "worklet";
+  return (
+    a00 * (a11 * a22 - a12 * a21) +
+    a01 * (a12 * a20 - a10 * a22) +
+    a02 * (a10 * a21 - a11 * a20)
+  );
+};
+
+/**
+ * Inverts a 4x4 matrix
+ * @worklet
+ * @returns The inverted matrix, or the identity matrix if the input is not invertible
+ */
+export const invert4 = (m: Matrix4): Matrix4 => {
+  "worklet";
+
+  const a00 = m[0],
+    a01 = m[1],
+    a02 = m[2],
+    a03 = m[3];
+  const a10 = m[4],
+    a11 = m[5],
+    a12 = m[6],
+    a13 = m[7];
+  const a20 = m[8],
+    a21 = m[9],
+    a22 = m[10],
+    a23 = m[11];
+  const a30 = m[12],
+    a31 = m[13],
+    a32 = m[14],
+    a33 = m[15];
+
+  // Calculate cofactors
+  const b00 = det3x3(a11, a12, a13, a21, a22, a23, a31, a32, a33);
+  const b01 = -det3x3(a10, a12, a13, a20, a22, a23, a30, a32, a33);
+  const b02 = det3x3(a10, a11, a13, a20, a21, a23, a30, a31, a33);
+  const b03 = -det3x3(a10, a11, a12, a20, a21, a22, a30, a31, a32);
+
+  const b10 = -det3x3(a01, a02, a03, a21, a22, a23, a31, a32, a33);
+  const b11 = det3x3(a00, a02, a03, a20, a22, a23, a30, a32, a33);
+  const b12 = -det3x3(a00, a01, a03, a20, a21, a23, a30, a31, a33);
+  const b13 = det3x3(a00, a01, a02, a20, a21, a22, a30, a31, a32);
+
+  const b20 = det3x3(a01, a02, a03, a11, a12, a13, a31, a32, a33);
+  const b21 = -det3x3(a00, a02, a03, a10, a12, a13, a30, a32, a33);
+  const b22 = det3x3(a00, a01, a03, a10, a11, a13, a30, a31, a33);
+  const b23 = -det3x3(a00, a01, a02, a10, a11, a12, a30, a31, a32);
+
+  const b30 = -det3x3(a01, a02, a03, a11, a12, a13, a21, a22, a23);
+  const b31 = det3x3(a00, a02, a03, a10, a12, a13, a20, a22, a23);
+  const b32 = -det3x3(a00, a01, a03, a10, a11, a13, a20, a21, a23);
+  const b33 = det3x3(a00, a01, a02, a10, a11, a12, a20, a21, a22);
+
+  // Calculate determinant
+  const det = a00 * b00 + a01 * b01 + a02 * b02 + a03 * b03;
+
+  // Check if matrix is invertible
+  if (Math.abs(det) < 1e-8) {
+    // Return identity matrix if not invertible
+    return Matrix4();
+  }
+
+  const invDet = 1.0 / det;
+
+  // Calculate inverse matrix
+  return [
+    b00 * invDet,
+    b10 * invDet,
+    b20 * invDet,
+    b30 * invDet,
+    b01 * invDet,
+    b11 * invDet,
+    b21 * invDet,
+    b31 * invDet,
+    b02 * invDet,
+    b12 * invDet,
+    b22 * invDet,
+    b32 * invDet,
+    b03 * invDet,
+    b13 * invDet,
+    b23 * invDet,
+    b33 * invDet,
+  ] as Matrix4;
+};

package/src/skia/types/Surface/Surface.ts

@@ -14,6 +14,18 @@ export interface SkSurface extends SkJSIInstance<"Surface"> {
   */
   getCanvas(): SkCanvas;
 
+  /**
+   * Returns the backend texture of the surface.
+   * The returned object can be used to create a Skia Image object.
+   * The returned object is backend specific and should be used with caution.
+   * It is the caller's responsibility to ensure that the texture is not used after the surface is deleted
+   * or draw operations are performed on the surface.
+   * The returned object may be null if the surface does not have a backend texture.
+   *
+   * @return backend texture of the surface or null
+   */
+  getNativeTextureUnstable(): unknown;
+
   /** Returns Image capturing Surface contents. Subsequent drawing to
      Surface contents are not captured.
 

package/src/skia/web/JsiSkImage.ts

@@ -170,4 +170,9 @@ export class JsiSkImage extends HostObject<Image, "Image"> implements SkImage {
     }
     return new JsiSkImage(this.CanvasKit, img);
   }
+
+  getNativeTextureUnstable(): unknown {
+    console.warn("getBackendTexture is not implemented on Web");
+    return null;
+  }
 }

package/src/skia/web/JsiSkImageFactory.ts

@@ -75,6 +75,10 @@ export class JsiSkImageFactory extends Host implements ImageFactory {
     return new JsiSkImage(this.CanvasKit, image);
   }
 
+  MakeImageFromNativeTextureUnstable(): SkImage {
+    throw new Error("MakeImageFromNativeTexture is not implemented on web");
+  }
+
   MakeImage(info: ImageInfo, data: SkData, bytesPerRow: number) {
     // see toSkImageInfo() from canvaskit
     const image = this.CanvasKit.MakeImage(

package/src/skia/web/JsiSkSurface.ts

@@ -43,4 +43,9 @@ export class JsiSkSurface
     );
     return new JsiSkImage(this.CanvasKit, image);
   }
+
+  getNativeTextureUnstable(): unknown {
+    console.warn("getBackendTexture is not implemented on Web");
+    return null;
+  }
 }

package/cpp/jsi/JsiValueWrapper.h

@@ -1,164 +0,0 @@
-#pragma once
-
-#include <jsi/jsi.h>
-#include <memory>
-#include <string>
-
-namespace RNJsi {
-namespace jsi = facebook::jsi;
-
-enum JsiWrapperValueType {
-  NonInitialized,
-  Undefined,
-  Null,
-  Bool,
-  Number,
-  String,
-  Object,
-  Function,
-  Array,
-  HostObject,
-  Unknown
-};
-
-/**
- Implements a simple wrapper class for JSI values where the value can be read
- without asking the runtime for any assistance Meaning that we can access
- members without being on the JS thread.
- */
-class JsiValueWrapper {
-public:
-  explicit JsiValueWrapper(jsi::Runtime &runtime)
-      : _type(JsiWrapperValueType::Undefined) {}
-
-  JsiValueWrapper(jsi::Runtime &runtime, const jsi::Value &value)
-      : JsiValueWrapper(runtime) {
-    setCurrent(runtime, value);
-  }
-
-  void setCurrent(jsi::Runtime &runtime, const jsi::Value &value) {
-    if (value.isNumber()) {
-      _type = JsiWrapperValueType::Number;
-      _numberValue = value.asNumber();
-    } else if (value.isBool()) {
-      _type = JsiWrapperValueType::Bool;
-      _boolValue = value.getBool();
-    } else if (value.isString()) {
-      _type = JsiWrapperValueType::String;
-      _stringValue = value.asString(runtime).utf8(runtime);
-    } else if (value.isUndefined()) {
-      _type = JsiWrapperValueType::Undefined;
-    } else if (value.isNull()) {
-      _type = JsiWrapperValueType::Null;
-    } else if (value.isObject()) {
-      _type = JsiWrapperValueType::Object;
-      _objectValue = std::make_shared<jsi::Object>(value.asObject(runtime));
-      if (_objectValue->isFunction(runtime)) {
-        _type = JsiWrapperValueType::Function;
-        _functionValue =
-            std::make_shared<jsi::Function>(_objectValue->asFunction(runtime));
-        _objectValue = nullptr;
-      } else if (_objectValue->isArray(runtime)) {
-        _type = JsiWrapperValueType::Array;
-        _arrayValue =
-            std::make_shared<jsi::Array>(_objectValue->asArray(runtime));
-        _objectValue = nullptr;
-      } else if (_objectValue->isHostObject(runtime)) {
-        _type = JsiWrapperValueType::HostObject;
-        _hostObjectValue = _objectValue->asHostObject(runtime);
-        _objectValue = nullptr;
-      }
-    } else {
-      throw std::runtime_error("Could not store jsi::Value of provided type");
-    }
-    // Save in value holder as well so that we can return current
-    if (_valueHolder == nullptr) {
-      _valueHolder = std::make_shared<jsi::Object>(runtime);
-    }
-    _valueHolder->setProperty(runtime, "current", value);
-  }
-
-  jsi::Value getCurrent(jsi::Runtime &runtime) {
-    if (_valueHolder == nullptr) {
-      return jsi::Value::undefined();
-    }
-    return _valueHolder->getProperty(runtime, "current");
-  }
-
-  bool isUndefinedOrNull() { return isUndefined() || isNull(); }
-
-  bool isUndefined() { return _type == JsiWrapperValueType::Undefined; }
-
-  bool isNull() { return _type == JsiWrapperValueType::Null; }
-
-  bool getAsBool() {
-    assert(_type == JsiWrapperValueType::Bool);
-    return _boolValue;
-  }
-
-  double getAsNumber() {
-    assert(_type == JsiWrapperValueType::Number);
-    return _numberValue;
-  }
-
-  const std::string &getAsString() {
-    assert(_type == JsiWrapperValueType::String);
-    return _stringValue;
-  }
-
-  std::shared_ptr<jsi::Function> getAsFunction() {
-    assert(_type == JsiWrapperValueType::Function);
-    return _functionValue;
-  }
-
-  std::shared_ptr<jsi::Array> getAsArray() {
-    assert(_type == JsiWrapperValueType::Array);
-    return _arrayValue;
-  }
-
-  std::shared_ptr<jsi::Object> getAsObject() {
-    assert(_type == JsiWrapperValueType::Object);
-    return _objectValue;
-  }
-
-  std::shared_ptr<jsi::HostObject> getAsHostObject() {
-    assert(_type == JsiWrapperValueType::HostObject);
-    return _hostObjectValue;
-  }
-
-  JsiWrapperValueType getType() { return _type; }
-
-  bool equals(jsi::Runtime &runtime, const jsi::Value &value) {
-    if (value.isNumber() && _type == JsiWrapperValueType::Number) {
-      return _numberValue == value.asNumber();
-    } else if (value.isBool() && _type == JsiWrapperValueType::Bool) {
-      return _boolValue == value.getBool();
-    } else if (value.isUndefined()) {
-      return _type == JsiWrapperValueType::Undefined;
-    } else if (value.isNull()) {
-      return _type == JsiWrapperValueType::Null;
-    } else if (value.isString()) {
-      auto current = getCurrent(runtime);
-      if (current.isString()) {
-        return jsi::String::strictEquals(runtime, value.asString(runtime),
-                                         current.asString(runtime));
-      }
-      return false;
-    }
-    return false;
-  }
-
-private:
-  std::shared_ptr<jsi::Object> _valueHolder;
-
-  bool _boolValue;
-  double _numberValue;
-  std::string _stringValue;
-  std::shared_ptr<jsi::Object> _objectValue;
-  std::shared_ptr<jsi::Function> _functionValue;
-  std::shared_ptr<jsi::Array> _arrayValue;
-  std::shared_ptr<jsi::HostObject> _hostObjectValue;
-
-  JsiWrapperValueType _type;
-};
-} // namespace RNJsi

package/ios/RNSkia-iOS/SkiaMetalSurfaceFactory.h

@@ -1,128 +0,0 @@
-#pragma once
-
-#import <MetalKit/MetalKit.h>
-
-#include <memory>
-
-#include "RNSkLog.h"
-#include "WindowContext.h"
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#import "include/core/SkCanvas.h"
-#import "include/core/SkColorSpace.h"
-
-#import <CoreMedia/CMSampleBuffer.h>
-#import <CoreVideo/CVMetalTextureCache.h>
-
-#import <include/gpu/ganesh/GrBackendSurface.h>
-#import <include/gpu/ganesh/GrDirectContext.h>
-#import <include/gpu/ganesh/SkImageGanesh.h>
-#import <include/gpu/ganesh/SkSurfaceGanesh.h>
-#import <include/gpu/ganesh/mtl/GrMtlBackendContext.h>
-#import <include/gpu/ganesh/mtl/GrMtlBackendSurface.h>
-#import <include/gpu/ganesh/mtl/GrMtlDirectContext.h>
-#import <include/gpu/ganesh/mtl/SkSurfaceMetal.h>
-
-#pragma clang diagnostic pop
-
-using SkiaMetalContext = struct SkiaMetalContext {
-  id<MTLCommandQueue> commandQueue = nullptr;
-  sk_sp<GrDirectContext> skContext = nullptr;
-};
-
-class SkiaMetalSurfaceFactory {
-  friend class IOSSkiaContext;
-
-public:
-  static sk_sp<SkSurface> makeOffscreenSurface(id<MTLDevice> device,
-                                               SkiaMetalContext *context,
-                                               int width, int height);
-
-  static sk_sp<SkImage>
-  makeTextureFromCVPixelBuffer(SkiaMetalContext *context,
-                               CVPixelBufferRef pixelBuffer);
-
-  static std::unique_ptr<RNSkia::WindowContext>
-  makeContext(SkiaMetalContext *context, CALayer *texture, int width,
-              int height);
-};
-
-class IOSSkiaContext : public RNSkia::WindowContext {
-public:
-  IOSSkiaContext(SkiaMetalContext *context, CALayer *layer, int width,
-                 int height)
-      : _context(context) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability-new"
-    _layer = (CAMetalLayer *)layer;
-#pragma clang diagnostic pop
-    _layer.framebufferOnly = NO;
-    _layer.device = MTLCreateSystemDefaultDevice();
-    _layer.opaque = false;
-    _layer.contentsScale = [UIScreen mainScreen].scale;
-    _layer.pixelFormat = MTLPixelFormatBGRA8Unorm;
-    _layer.contentsGravity = kCAGravityBottomLeft;
-    _layer.drawableSize = CGSizeMake(width, height);
-  }
-
-  ~IOSSkiaContext() {}
-
-  sk_sp<SkSurface> getSurface() override {
-    if (_skSurface) {
-      return _skSurface;
-    }
-
-    // Get the next drawable from the CAMetalLayer
-    _currentDrawable = [_layer nextDrawable];
-    if (!_currentDrawable) {
-      RNSkia::RNSkLogger::logToConsole(
-          "Could not retrieve drawable from CAMetalLayer");
-      return nullptr;
-    }
-
-    // Get the texture from the drawable
-    GrMtlTextureInfo fbInfo;
-    fbInfo.fTexture.retain((__bridge void *)_currentDrawable.texture);
-
-    GrBackendRenderTarget backendRT = GrBackendRenderTargets::MakeMtl(
-        _layer.drawableSize.width, _layer.drawableSize.height, fbInfo);
-
-    _skSurface = SkSurfaces::WrapBackendRenderTarget(
-        _context->skContext.get(), backendRT, kTopLeft_GrSurfaceOrigin,
-        kBGRA_8888_SkColorType, nullptr, nullptr);
-
-    return _skSurface;
-  }
-
-  void present() override {
-    if (auto dContext = GrAsDirectContext(_skSurface->recordingContext())) {
-      dContext->flushAndSubmit();
-    }
-
-    id<MTLCommandBuffer> commandBuffer([_context->commandQueue commandBuffer]);
-    [commandBuffer presentDrawable:_currentDrawable];
-    [commandBuffer commit];
-    _skSurface = nullptr;
-  }
-
-  int getWidth() override {
-    return _layer.frame.size.width * _layer.contentsScale;
-  };
-
-  int getHeight() override {
-    return _layer.frame.size.height * _layer.contentsScale;
-  };
-
-  void resize(int width, int height) override { _skSurface = nullptr; }
-
-private:
-  SkiaMetalContext *_context;
-  sk_sp<SkSurface> _skSurface = nullptr;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability-new"
-  CAMetalLayer *_layer;
-#pragma clang diagnostic pop
-  id<CAMetalDrawable> _currentDrawable = nil;
-};

package/ios/RNSkia-iOS/SkiaMetalSurfaceFactory.mm

@@ -1,92 +0,0 @@
-#import "RNSkLog.h"
-
-#import "SkiaCVPixelBufferUtils.h"
-#import "SkiaMetalSurfaceFactory.h"
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#import "include/core/SkCanvas.h"
-#import "include/core/SkColorSpace.h"
-#import "include/core/SkSurface.h"
-
-#import <include/gpu/ganesh/GrBackendSurface.h>
-#import <include/gpu/ganesh/GrDirectContext.h>
-#import <include/gpu/ganesh/SkImageGanesh.h>
-#import <include/gpu/ganesh/SkSurfaceGanesh.h>
-#import <include/gpu/ganesh/mtl/GrMtlBackendContext.h>
-#import <include/gpu/ganesh/mtl/GrMtlBackendSurface.h>
-#import <include/gpu/ganesh/mtl/GrMtlDirectContext.h>
-#import <include/gpu/ganesh/mtl/SkSurfaceMetal.h>
-
-#pragma clang diagnostic pop
-
-struct OffscreenRenderContext {
-  id<MTLTexture> texture;
-
-  OffscreenRenderContext(id<MTLDevice> device,
-                         sk_sp<GrDirectContext> skiaContext,
-                         id<MTLCommandQueue> commandQueue, int width,
-                         int height) {
-    // Create a Metal texture descriptor
-    MTLTextureDescriptor *textureDescriptor = [MTLTextureDescriptor
-        texture2DDescriptorWithPixelFormat:MTLPixelFormatBGRA8Unorm
-                                     width:width
-                                    height:height
-                                 mipmapped:NO];
-    textureDescriptor.usage =
-        MTLTextureUsageRenderTarget | MTLTextureUsageShaderRead;
-    texture = [device newTextureWithDescriptor:textureDescriptor];
-  }
-};
-
-std::unique_ptr<RNSkia::WindowContext>
-SkiaMetalSurfaceFactory::makeContext(SkiaMetalContext *context,
-                                     CALayer *texture, int width, int height) {
-  return std::make_unique<IOSSkiaContext>(context, texture, width, height);
-}
-
-sk_sp<SkSurface> SkiaMetalSurfaceFactory::makeOffscreenSurface(
-    id<MTLDevice> device, SkiaMetalContext *context, int width, int height) {
-
-  auto ctx = new OffscreenRenderContext(device, context->skContext,
-                                        context->commandQueue, width, height);
-
-  // Create a GrBackendTexture from the Metal texture
-  GrMtlTextureInfo info;
-  info.fTexture.retain((__bridge void *)ctx->texture);
-  GrBackendTexture backendTexture =
-      GrBackendTextures::MakeMtl(width, height, skgpu::Mipmapped::kNo, info);
-
-  // Create a SkSurface from the GrBackendTexture
-  auto surface = SkSurfaces::WrapBackendTexture(
-      context->skContext.get(), backendTexture, kTopLeft_GrSurfaceOrigin, 0,
-      kBGRA_8888_SkColorType, nullptr, nullptr,
-      [](void *addr) { delete (OffscreenRenderContext *)addr; }, ctx);
-
-  return surface;
-}
-
-sk_sp<SkImage> SkiaMetalSurfaceFactory::makeTextureFromCVPixelBuffer(
-    SkiaMetalContext *context, CVPixelBufferRef pixelBuffer) {
-  SkiaCVPixelBufferUtils::CVPixelBufferBaseFormat format =
-      SkiaCVPixelBufferUtils::getCVPixelBufferBaseFormat(pixelBuffer);
-  switch (format) {
-  case SkiaCVPixelBufferUtils::CVPixelBufferBaseFormat::rgb: {
-    // CVPixelBuffer is in any RGB format, single-plane
-    return SkiaCVPixelBufferUtils::RGB::makeSkImageFromCVPixelBuffer(
-        context->skContext.get(), pixelBuffer);
-  }
-  case SkiaCVPixelBufferUtils::CVPixelBufferBaseFormat::yuv: {
-    // CVPixelBuffer is in any YUV format, multi-plane
-    return SkiaCVPixelBufferUtils::YUV::makeSkImageFromCVPixelBuffer(
-        context->skContext.get(), pixelBuffer);
-  }
-  default:
-    [[unlikely]] {
-      throw std::runtime_error("Failed to convert NativeBuffer to SkImage - "
-                               "NativeBuffer has unsupported PixelFormat! " +
-                               std::to_string(static_cast<int>(format)));
-    }
-  }
-}