@shopify/react-native-skia 1.11.18 → 1.12.0

package/src/sksg/Recorder/commands/Box.ts

@@ -2,7 +2,7 @@ import { deflate, inflate, processColor } from "../../../dom/nodes";
 import type { BoxProps, BoxShadowProps } from "../../../dom/types";
 import { BlurStyle, ClipOp, isRRect } from "../../../skia/types";
 import type { Command } from "../Core";
-import { CommandType, materializeProps } from "../Core";
+import { CommandType, materializeCommand } from "../Core";
 import type { DrawingContext } from "../DrawingContext";
 
 interface BoxCommand extends Command<CommandType.DrawBox> {
@@ -17,11 +17,9 @@ export const isBoxCommand = (command: Command): command is BoxCommand => {
 
 export const drawBox = (ctx: DrawingContext, command: BoxCommand) => {
   "worklet";
-  command.shadows.forEach((shadow) => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    materializeProps(shadow as any);
+  const shadows = command.shadows.map((shadow) => {
+    return materializeCommand(shadow).props;
   });
-  const shadows = command.shadows.map((shadow) => shadow.props);
   const { paint, Skia, canvas } = ctx;
   const { box: defaultBox } = command.props;
   const opacity = paint.getAlphaf();

package/ios/RNSkia-iOS/MetalContext.h

@@ -1,134 +0,0 @@
-#pragma once
-
-#include "MetalWindowContext.h"
-#include "SkiaCVPixelBufferUtils.h"
-
-#include "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>
-
-// namespace RNSkia {
-// class RNSkiOSPlatformContext;
-// }
-
-class MetalSharedContext {
-public:
-  static MetalSharedContext &getInstance() {
-    static MetalSharedContext instance;
-    return instance;
-  }
-
-  id<MTLDevice> getDevice() { return _device; }
-
-private:
-  MetalSharedContext() {
-    _device = MTLCreateSystemDefaultDevice();
-    if (!_device) {
-      throw std::runtime_error("Failed to create Metal device");
-    }
-  }
-
-  MetalSharedContext(const MetalSharedContext &) = delete;
-  MetalSharedContext &operator=(const MetalSharedContext &) = delete;
-
-  id<MTLDevice> _device;
-};
-
-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];
-  }
-};
-
-class MetalContext {
-
-public:
-  MetalContext(const MetalContext &) = delete;
-  MetalContext &operator=(const MetalContext &) = delete;
-
-  static MetalContext &getInstance() {
-    static thread_local MetalContext instance;
-    return instance;
-  }
-
-  sk_sp<SkSurface> MakeOffscreen(int width, int height) {
-    auto device = MetalSharedContext::getInstance().getDevice();
-    auto ctx = new OffscreenRenderContext(device, _directContext, _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(
-        _directContext.get(), backendTexture, kTopLeft_GrSurfaceOrigin, 0,
-        kBGRA_8888_SkColorType, nullptr, nullptr,
-        [](void *addr) { delete (OffscreenRenderContext *)addr; }, ctx);
-
-    return surface;
-  }
-
-  sk_sp<SkImage> MakeImageFromBuffer(void *buffer) {
-
-    CVPixelBufferRef sampleBuffer = (CVPixelBufferRef)buffer;
-    SkiaCVPixelBufferUtils::CVPixelBufferBaseFormat format =
-        SkiaCVPixelBufferUtils::getCVPixelBufferBaseFormat(sampleBuffer);
-    switch (format) {
-    case SkiaCVPixelBufferUtils::CVPixelBufferBaseFormat::rgb: {
-      // CVPixelBuffer is in any RGB format, single-plane
-      return SkiaCVPixelBufferUtils::RGB::makeSkImageFromCVPixelBuffer(
-          _directContext.get(), sampleBuffer);
-    }
-    case SkiaCVPixelBufferUtils::CVPixelBufferBaseFormat::yuv: {
-      // CVPixelBuffer is in any YUV format, multi-plane
-      return SkiaCVPixelBufferUtils::YUV::makeSkImageFromCVPixelBuffer(
-          _directContext.get(), sampleBuffer);
-    }
-    default:
-      [[unlikely]] {
-        throw std::runtime_error("Failed to convert NativeBuffer to SkImage - "
-                                 "NativeBuffer has unsupported PixelFormat! " +
-                                 std::to_string(static_cast<int>(format)));
-      }
-    }
-  }
-
-  std::unique_ptr<RNSkia::WindowContext> MakeWindow(CALayer *window, int width,
-                                                    int height) {
-    auto device = MetalSharedContext::getInstance().getDevice();
-    return std::make_unique<MetalWindowContext>(
-        _directContext.get(), device, _commandQueue, window, width, height);
-  }
-
-  GrDirectContext *getDirectContext() { return _directContext.get(); }
-
-private:
-  // friend class RNSkia::RNSkiOSPlatformContext;
-  id<MTLCommandQueue> _commandQueue = nullptr;
-  sk_sp<GrDirectContext> _directContext = nullptr;
-
-  MetalContext();
-};

package/ios/RNSkia-iOS/MetalContext.mm

@@ -1,34 +0,0 @@
-#include "MetalContext.h"
-
-#include "RNSkLog.h"
-
-#import <MetalKit/MetalKit.h>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#import <include/gpu/ganesh/GrBackendSurface.h>
-#import <include/gpu/ganesh/SkImageGanesh.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/GrMtlTypes.h>
-#import <include/gpu/ganesh/mtl/SkSurfaceMetal.h>
-
-#pragma clang diagnostic pop
-
-MetalContext::MetalContext() {
-  auto device = MetalSharedContext::getInstance().getDevice();
-  _commandQueue =
-      id<MTLCommandQueue>(CFRetain((GrMTLHandle)[device newCommandQueue]));
-  GrMtlBackendContext backendContext = {};
-  backendContext.fDevice.reset((__bridge void *)device);
-  backendContext.fQueue.reset((__bridge void *)_commandQueue);
-  GrContextOptions grContextOptions; // set different options here.
-
-  // Create the Skia Direct Context
-  _directContext = GrDirectContexts::MakeMetal(backendContext);
-  if (_directContext == nullptr) {
-    RNSkia::RNSkLogger::logToConsole("Couldn't create a Skia Metal Context");
-  }
-}

package/ios/RNSkia-iOS/MetalWindowContext.h

@@ -1,39 +0,0 @@
-#pragma once
-
-#import <MetalKit/MetalKit.h>
-
-#include "WindowContext.h"
-
-class SkiaMetalContext;
-
-class MetalWindowContext : public RNSkia::WindowContext {
-public:
-  MetalWindowContext(GrDirectContext *directContext, id<MTLDevice> device,
-                     id<MTLCommandQueue> commandQueue, CALayer *layer,
-                     int width, int height);
-  ~MetalWindowContext() = default;
-
-  sk_sp<SkSurface> getSurface() override;
-
-  void present() override;
-
-  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:
-  GrDirectContext *_directContext;
-  id<MTLCommandQueue> _commandQueue;
-  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/MetalWindowContext.mm

@@ -1,60 +0,0 @@
-#include "MetalWindowContext.h"
-
-#include "MetalContext.h"
-#include "RNSkLog.h"
-
-MetalWindowContext::MetalWindowContext(GrDirectContext *directContext,
-                                       id<MTLDevice> device,
-                                       id<MTLCommandQueue> commandQueue,
-                                       CALayer *layer, int width, int height)
-    : _directContext(directContext), _commandQueue(commandQueue) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability-new"
-  _layer = (CAMetalLayer *)layer;
-#pragma clang diagnostic pop
-  _layer.framebufferOnly = NO;
-  _layer.device = device;
-  _layer.opaque = false;
-  _layer.contentsScale = [UIScreen mainScreen].scale;
-  _layer.pixelFormat = MTLPixelFormatBGRA8Unorm;
-  _layer.contentsGravity = kCAGravityBottomLeft;
-  _layer.drawableSize = CGSizeMake(width, height);
-}
-
-sk_sp<SkSurface> MetalWindowContext::getSurface() {
-  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(
-      _directContext, backendRT, kTopLeft_GrSurfaceOrigin,
-      kBGRA_8888_SkColorType, nullptr, nullptr);
-
-  return _skSurface;
-}
-
-void MetalWindowContext::present() {
-  if (auto dContext = GrAsDirectContext(_skSurface->recordingContext())) {
-    dContext->flushAndSubmit();
-  }
-
-  id<MTLCommandBuffer> commandBuffer([_commandQueue commandBuffer]);
-  [commandBuffer presentDrawable:_currentDrawable];
-  [commandBuffer commit];
-  _skSurface = nullptr;
-}

package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.h

@@ -1,38 +0,0 @@
-#pragma once
-
-#import "RNSkPlatformContext.h"
-#import "RNSkView.h"
-
-#import <MetalKit/MetalKit.h>
-#import <QuartzCore/CAMetalLayer.h>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#import <include/gpu/ganesh/GrDirectContext.h>
-
-#pragma clang diagnostic pop
-
-class RNSkMetalCanvasProvider : public RNSkia::RNSkCanvasProvider {
-public:
-  RNSkMetalCanvasProvider(std::function<void()> requestRedraw,
-                          std::shared_ptr<RNSkia::RNSkPlatformContext> context);
-
-  ~RNSkMetalCanvasProvider();
-
-  int getScaledWidth() override;
-  int getScaledHeight() override;
-
-  bool renderToCanvas(const std::function<void(SkCanvas *)> &cb) override;
-
-  void setSize(int width, int height);
-  CALayer *getLayer();
-
-private:
-  std::shared_ptr<RNSkia::RNSkPlatformContext> _context;
-  std::unique_ptr<RNSkia::WindowContext> _ctx = nullptr;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability-new"
-  CAMetalLayer *_layer;
-#pragma clang diagnostic pop
-};

package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.mm

@@ -1,103 +0,0 @@
-#import "RNSkMetalCanvasProvider.h"
-
-#import "RNSkLog.h"
-
-#if defined(SK_GRAPHITE)
-#import "DawnContext.h"
-#else
-#import "MetalContext.h"
-#endif
-
-#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/SkSurfaceGanesh.h>
-
-#pragma clang diagnostic pop
-
-RNSkMetalCanvasProvider::RNSkMetalCanvasProvider(
-    std::function<void()> requestRedraw,
-    std::shared_ptr<RNSkia::RNSkPlatformContext> context)
-    : RNSkCanvasProvider(requestRedraw), _context(context) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability-new"
-  _layer = [CAMetalLayer layer];
-#pragma clang diagnostic pop
-}
-
-RNSkMetalCanvasProvider::~RNSkMetalCanvasProvider() {}
-
-/**
- Returns the scaled width of the view
- */
-int RNSkMetalCanvasProvider::getScaledWidth() {
-  return _ctx ? _ctx->getWidth() : -1;
-};
-
-/**
- Returns the scaled height of the view
- */
-int RNSkMetalCanvasProvider::getScaledHeight() {
-  return _ctx ? _ctx->getHeight() : -1;
-};
-
-/**
- Render to a canvas
- */
-bool RNSkMetalCanvasProvider::renderToCanvas(
-    const std::function<void(SkCanvas *)> &cb) {
-  if (!_ctx) {
-    return false;
-  }
-
-  // Make sure to NOT render or try any render operations while we're in the
-  // background or inactive. This will cause an error that might clear the
-  // CAMetalLayer so that the canvas is empty when the app receives focus again.
-  // Reference: https://github.com/Shopify/react-native-skia/issues/1257
-  // NOTE: UIApplication.sharedApplication.applicationState can only be
-  // accessed from the main thread so we need to check here.
-  if ([[NSThread currentThread] isMainThread]) {
-    auto state = UIApplication.sharedApplication.applicationState;
-    if (state == UIApplicationStateBackground) {
-      // Request a redraw in the next run loop callback
-      _requestRedraw();
-      // and don't draw now since it might cause errors in the metal renderer if
-      // we try to render while in the background. (see above issue)
-      return false;
-    }
-  }
-  // Wrap in auto release pool since we want the system to clean up after
-  // rendering and not wait until later - we've seen some example of memory
-  // usage growing very fast in the simulator without this.
-  @autoreleasepool {
-    auto surface = _ctx->getSurface();
-    if (!surface) {
-      return false;
-    }
-    auto canvas = surface->getCanvas();
-    cb(canvas);
-    _ctx->present();
-  }
-  return true;
-};
-
-void RNSkMetalCanvasProvider::setSize(int width, int height) {
-  _layer.frame = CGRectMake(0, 0, width, height);
-  auto w = width * _context->getPixelDensity();
-  auto h = height * _context->getPixelDensity();
-#if defined(SK_GRAPHITE)
-  _ctx = RNSkia::DawnContext::getInstance().MakeWindow((__bridge void *)_layer,
-                                                       w, h);
-#else
-  _ctx = MetalContext::getInstance().MakeWindow(_layer, w, h);
-#endif
-  _requestRedraw();
-}
-
-CALayer *RNSkMetalCanvasProvider::getLayer() { return _layer; }

package/ios/RNSkia-iOS/RNSkiOSPlatformContext.h

@@ -1,75 +0,0 @@
-#pragma once
-
-#import <React/RCTBridge+Private.h>
-#import <React/RCTBridge.h>
-
-#include <functional>
-#include <memory>
-#include <string>
-
-#include "RNSkPlatformContext.h"
-#include "ViewScreenshotService.h"
-
-namespace facebook {
-namespace react {
-class CallInvoker;
-}
-} // namespace facebook
-
-namespace RNSkia {
-
-class RNSkiOSPlatformContext : public RNSkPlatformContext {
-public:
-  RNSkiOSPlatformContext(
-      RCTBridge *bridge,
-      std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker)
-      : RNSkPlatformContext(jsCallInvoker, [[UIScreen mainScreen] scale]) {
-
-    // Create screenshot manager
-    _screenshotService =
-        [[ViewScreenshotService alloc] initWithUiManager:bridge.uiManager];
-  }
-
-  ~RNSkiOSPlatformContext() = default;
-
-  void runOnMainThread(std::function<void()>) override;
-
-  sk_sp<SkImage> takeScreenshotFromViewTag(size_t tag) override;
-
-  sk_sp<SkImage> makeImageFromNativeBuffer(void *buffer) override;
-
-  sk_sp<SkImage> makeImageFromNativeTexture(const TextureInfo &textureInfo,
-                                            int width, int height,
-                                            bool mipMapped) override;
-
-  uint64_t makeNativeBuffer(sk_sp<SkImage> image) override;
-
-  const TextureInfo getTexture(sk_sp<SkSurface> image) override;
-
-  const TextureInfo getTexture(sk_sp<SkImage> image) override;
-
-  void releaseNativeBuffer(uint64_t pointer) override;
-
-  std::shared_ptr<RNSkVideo> createVideo(const std::string &url) override;
-
-  std::shared_ptr<WindowContext>
-  makeContextFromNativeSurface(void *surface, int width, int height) override;
-
-  virtual void performStreamOperation(
-      const std::string &sourceUri,
-      const std::function<void(std::unique_ptr<SkStreamAsset>)> &op) override;
-
-  void raiseError(const std::exception &err) override;
-  sk_sp<SkSurface> makeOffscreenSurface(int width, int height) override;
-#if !defined(SK_GRAPHITE)
-  GrDirectContext *getDirectContext() override;
-#endif
-  sk_sp<SkFontMgr> createFontMgr() override;
-
-private:
-  ViewScreenshotService *_screenshotService;
-
-  SkColorType mtlPixelFormatToSkColorType(MTLPixelFormat pixelFormat);
-};
-
-} // namespace RNSkia