@shopify/react-native-skia 1.5.0 → 1.5.2

package/cpp/api/JsiSkTypefaceFontProvider.h

@@ -40,7 +40,7 @@ public:
     sk_sp<SkTypeface> typeface =
         JsiSkTypeface::fromValue(runtime, arguments[0]);
     SkString familyName(arguments[1].asString(runtime).utf8(runtime).c_str());
-    auto result = getObject()->registerTypeface(typeface, familyName);
+    getObject()->registerTypeface(typeface, familyName);
     return jsi::Value::undefined();
   }
 

package/cpp/api/JsiSkiaContext.h

@@ -14,7 +14,7 @@
 #include "JsiSkRect.h"
 #include "JsiSkTypeface.h"
 
-#include "SkiaContext.h"
+#include "WindowContext.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -28,12 +28,15 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkiaContext : public JsiSkWrappingSharedPtrHostObject<SkiaContext> {
+class JsiSkiaContext : public JsiSkWrappingSharedPtrHostObject<WindowContext> {
 public:
   EXPORT_JSI_API_TYPENAME(JsiSkiaContext, SkiaContext)
 
   JSI_HOST_FUNCTION(getSurface) {
     auto surface = getObject()->getSurface();
+    if (surface == nullptr) {
+      return jsi::Value::null();
+    }
     return jsi::Object::createFromHostObject(
         runtime,
         std::make_shared<JsiSkSurface>(getContext(), std::move(surface)));
@@ -48,7 +51,7 @@ public:
                        JSI_EXPORT_FUNC(JsiSkiaContext, present))
 
   JsiSkiaContext(std::shared_ptr<RNSkPlatformContext> context,
-                 std::shared_ptr<SkiaContext> ctx)
+                 std::shared_ptr<WindowContext> ctx)
       : JsiSkWrappingSharedPtrHostObject(std::move(context), std::move(ctx)) {}
 
   /**

package/cpp/jsi/JsiValue.cpp

@@ -55,9 +55,8 @@ double JsiValue::getAsNumber() const {
 
 const std::string &JsiValue::getAsString() const {
   if (_type == PropType::Number) {
-    return std::move(std::to_string(_numberValue));
+    return std::to_string(_numberValue);
   }
-
   if (_type != PropType::String) {
     throw std::runtime_error("Expected type string, got " +
                              getTypeAsString(_type));

package/cpp/rnskia/RNSkPlatformContext.h

@@ -11,7 +11,7 @@
 
 #include "RNSkDispatchQueue.h"
 #include "RNSkVideo.h"
-#include "SkiaContext.h"
+#include "WindowContext.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -135,7 +135,7 @@ public:
    */
   virtual sk_sp<SkSurface> makeOffscreenSurface(int width, int height) = 0;
 
-  virtual std::shared_ptr<SkiaContext>
+  virtual std::shared_ptr<WindowContext>
   makeContextFromNativeSurface(void *surface, int width, int height) = 0;
 
   /**

package/cpp/rnskia/{SkiaContext.h → WindowContext.h}

@@ -12,11 +12,14 @@
 
 namespace RNSkia {
 
-class SkiaContext {
+class WindowContext {
 public:
-  virtual ~SkiaContext() = default;
+  virtual ~WindowContext() = default;
   virtual sk_sp<SkSurface> getSurface() = 0;
   virtual void present() = 0;
+  virtual void resize(int width, int height) = 0;
+  virtual int getWidth() = 0;
+  virtual int getHeight() = 0;
 };
 
 } // namespace RNSkia

package/ios/RNSkia-iOS/DisplayLink.mm

@@ -10,6 +10,13 @@
     _displayLink = [CADisplayLink displayLinkWithTarget:self
                                                selector:@selector(update:)];
 
+    if (@available(iOS 15.0, *)) {
+      CAFrameRateRange rate = CAFrameRateRangeMake(60, 120, 120);
+      _displayLink.preferredFrameRateRange = rate;
+    } else {
+      _displayLink.preferredFramesPerSecond = 60;
+    }
+
     // add the display link to the main run loop
     [_displayLink addToRunLoop:[NSRunLoop mainRunLoop]
                        forMode:NSRunLoopCommonModes];

package/ios/RNSkia-iOS/MetalContext.h

@@ -0,0 +1,46 @@
+#pragma once
+
+#include "SkiaMetalSurfaceFactory.h"
+#include "WindowContext.h"
+
+#include "include/core/SkSurface.h"
+
+namespace RNSkia {
+class RNSkiOSPlatformContext;
+}
+
+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) {
+    return SkiaMetalSurfaceFactory::makeOffscreenSurface(_device, &_context,
+                                                         width, height);
+  }
+
+  sk_sp<SkImage> MakeImageFromBuffer(void *buffer) {
+    CVPixelBufferRef sampleBuffer = (CVPixelBufferRef)buffer;
+    return SkiaMetalSurfaceFactory::makeTextureFromCVPixelBuffer(&_context,
+                                                                 sampleBuffer);
+  }
+
+  std::unique_ptr<RNSkia::WindowContext> MakeWindow(CALayer *window, int width,
+                                                    int height) {
+    return SkiaMetalSurfaceFactory::makeContext(&_context, window, width,
+                                                height);
+  }
+
+private:
+  friend class RNSkia::RNSkiOSPlatformContext;
+  id<MTLDevice> _device;
+  SkiaMetalContext _context;
+
+  MetalContext();
+};

package/ios/RNSkia-iOS/MetalContext.mm

@@ -0,0 +1,33 @@
+#include "MetalContext.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() {
+  _device = MTLCreateSystemDefaultDevice();
+  _context.commandQueue =
+      id<MTLCommandQueue>(CFRetain((GrMTLHandle)[_device newCommandQueue]));
+
+  GrMtlBackendContext backendContext = {};
+  backendContext.fDevice.reset((__bridge void *)_device);
+  backendContext.fQueue.reset((__bridge void *)_context.commandQueue);
+  GrContextOptions grContextOptions; // set different options here.
+
+  // Create the Skia Direct Context
+  _context.skContext = GrDirectContexts::MakeMetal(backendContext);
+  if (_context.skContext == nullptr) {
+    RNSkia::RNSkLogger::logToConsole("Couldn't create a Skia Metal Context");
+  }
+}

package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.mm

@@ -1,6 +1,6 @@
 #import "RNSkMetalCanvasProvider.h"
+#include "MetalContext.h"
 #import "RNSkLog.h"
-#import "SkiaMetalSurfaceFactory.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -23,12 +23,6 @@ RNSkMetalCanvasProvider::RNSkMetalCanvasProvider(
 #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 = _context->getPixelDensity();
-  _layer.pixelFormat = MTLPixelFormatBGRA8Unorm;
-  _layer.contentsGravity = kCAGravityBottomLeft;
 }
 
 RNSkMetalCanvasProvider::~RNSkMetalCanvasProvider() {}
@@ -36,16 +30,12 @@ RNSkMetalCanvasProvider::~RNSkMetalCanvasProvider() {}
 /**
  Returns the scaled width of the view
  */
-float RNSkMetalCanvasProvider::getScaledWidth() {
-  return _width * _context->getPixelDensity();
-};
+float RNSkMetalCanvasProvider::getScaledWidth() { return _width; };
 
 /**
  Returns the scaled height of the view
  */
-float RNSkMetalCanvasProvider::getScaledHeight() {
-  return _height * _context->getPixelDensity();
-};
+float RNSkMetalCanvasProvider::getScaledHeight() { return _height; };
 
 /**
  Render to a canvas
@@ -80,11 +70,8 @@ bool RNSkMetalCanvasProvider::renderToCanvas(
     if (currentDrawable == nullptr) {
       return false;
     }
-
-    auto skSurface = SkiaMetalSurfaceFactory::makeWindowedSurface(
-        currentDrawable.texture, _layer.drawableSize.width,
-        _layer.drawableSize.height);
-
+    auto ctx = MetalContext::getInstance().MakeWindow(_layer, _width, _height);
+    auto skSurface = ctx->getSurface();
     SkCanvas *canvas = skSurface->getCanvas();
     cb(canvas);
 
@@ -92,22 +79,15 @@ bool RNSkMetalCanvasProvider::renderToCanvas(
       dContext->flushAndSubmit();
     }
 
-    id<MTLCommandBuffer> commandBuffer(
-        [ThreadContextHolder::ThreadSkiaMetalContext
-                .commandQueue commandBuffer]);
-    [commandBuffer presentDrawable:currentDrawable];
-    [commandBuffer commit];
+    ctx->present();
   }
   return true;
 };
 
 void RNSkMetalCanvasProvider::setSize(int width, int height) {
-  _width = width;
-  _height = height;
   _layer.frame = CGRectMake(0, 0, width, height);
-  _layer.drawableSize = CGSizeMake(width * _context->getPixelDensity(),
-                                   height * _context->getPixelDensity());
-
+  _width = width * _context->getPixelDensity();
+  _height = height * _context->getPixelDensity();
   _requestRedraw();
 }
 

package/ios/RNSkia-iOS/RNSkiOSPlatformContext.h

@@ -67,7 +67,7 @@ public:
 
   std::shared_ptr<RNSkVideo> createVideo(const std::string &url) override;
 
-  std::shared_ptr<SkiaContext>
+  std::shared_ptr<WindowContext>
   makeContextFromNativeSurface(void *surface, int width, int height) override;
 
   virtual void performStreamOperation(

package/ios/RNSkia-iOS/RNSkiOSPlatformContext.mm

@@ -5,13 +5,13 @@
 #include <thread>
 #include <utility>
 
+#include "MetalContext.h"
 #include "RNSkiOSVideo.h"
-#import "SkiaCVPixelBufferUtils.h"
-#import "SkiaMetalSurfaceFactory.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
+#import "include/core/SkColorSpace.h"
 #include "include/core/SkFontMgr.h"
 #include "include/core/SkSurface.h"
 
@@ -71,7 +71,7 @@ uint64_t RNSkiOSPlatformContext::makeNativeBuffer(sk_sp<SkImage> image) {
   if (image->colorType() != kBGRA_8888_SkColorType) {
     // on iOS, 32_BGRA is the only supported RGB format for CVPixelBuffers.
     image = image->makeColorTypeAndColorSpace(
-        ThreadContextHolder::ThreadSkiaMetalContext.skContext.get(),
+        MetalContext::getInstance()._context.skContext.get(),
         kBGRA_8888_SkColorType, SkColorSpace::MakeSRGB());
     if (image == nullptr) {
       throw std::runtime_error(
@@ -149,11 +149,11 @@ RNSkiOSPlatformContext::createVideo(const std::string &url) {
   return std::make_shared<RNSkiOSVideo>(url, this);
 }
 
-std::shared_ptr<SkiaContext>
+std::shared_ptr<WindowContext>
 RNSkiOSPlatformContext::makeContextFromNativeSurface(void *surface, int width,
                                                      int height) {
-  return SkiaMetalSurfaceFactory::makeContext((__bridge CALayer *)surface,
-                                              width, height);
+  return MetalContext::getInstance().MakeWindow((__bridge CALayer *)surface,
+                                                width, height);
 }
 
 void RNSkiOSPlatformContext::raiseError(const std::exception &err) {
@@ -162,12 +162,11 @@ void RNSkiOSPlatformContext::raiseError(const std::exception &err) {
 
 sk_sp<SkSurface> RNSkiOSPlatformContext::makeOffscreenSurface(int width,
                                                               int height) {
-  return SkiaMetalSurfaceFactory::makeOffscreenSurface(width, height);
+  return MetalContext::getInstance().MakeOffscreen(width, height);
 }
 
 sk_sp<SkImage> RNSkiOSPlatformContext::makeImageFromNativeBuffer(void *buffer) {
-  CVPixelBufferRef sampleBuffer = (CVPixelBufferRef)buffer;
-  return SkiaMetalSurfaceFactory::makeTextureFromCVPixelBuffer(sampleBuffer);
+  return MetalContext::getInstance().MakeImageFromBuffer(buffer);
 }
 
 sk_sp<SkFontMgr> RNSkiOSPlatformContext::createFontMgr() {

package/ios/RNSkia-iOS/RNSkiOSView.mm

@@ -1,5 +1,3 @@
-#pragma once
-
 #import <memory>
 
 #import "RNSkMetalCanvasProvider.h"

package/ios/RNSkia-iOS/SkiaMetalSurfaceFactory.h

@@ -1,9 +1,11 @@
+#pragma once
+
 #import <MetalKit/MetalKit.h>
 
 #include <memory>
 
 #include "RNSkLog.h"
-#include "SkiaContext.h"
+#include "WindowContext.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -20,35 +22,31 @@ using SkiaMetalContext = struct SkiaMetalContext {
   sk_sp<GrDirectContext> skContext = nullptr;
 };
 
-class ThreadContextHolder {
-public:
-  static thread_local SkiaMetalContext ThreadSkiaMetalContext;
-};
-
 class SkiaMetalSurfaceFactory {
   friend class IOSSkiaContext;
 
 public:
-  static sk_sp<SkSurface> makeWindowedSurface(id<MTLTexture> texture, int width,
+  static sk_sp<SkSurface> makeWindowedSurface(SkiaMetalContext *context,
+                                              id<MTLTexture> texture, int width,
                                               int height);
-  static sk_sp<SkSurface> makeOffscreenSurface(int width, int height);
+  static sk_sp<SkSurface> makeOffscreenSurface(id<MTLDevice> device,
+                                               SkiaMetalContext *context,
+                                               int width, int height);
 
   static sk_sp<SkImage>
-  makeTextureFromCVPixelBuffer(CVPixelBufferRef pixelBuffer);
-
-  static std::shared_ptr<RNSkia::SkiaContext>
-  makeContext(CALayer *texture, int width, int height);
+  makeTextureFromCVPixelBuffer(SkiaMetalContext *context,
+                               CVPixelBufferRef pixelBuffer);
 
-private:
-  static id<MTLDevice> device;
-  static bool
-  createSkiaDirectContextIfNecessary(SkiaMetalContext *threadContext);
+  static std::unique_ptr<RNSkia::WindowContext>
+  makeContext(SkiaMetalContext *context, CALayer *texture, int width,
+              int height);
 };
 
-class IOSSkiaContext : public RNSkia::SkiaContext {
+class IOSSkiaContext : public RNSkia::WindowContext {
 public:
-  IOSSkiaContext(CALayer *layer, int width, int height) {
-    auto pd = 3;
+  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;
@@ -56,12 +54,10 @@ public:
     _layer.framebufferOnly = NO;
     _layer.device = MTLCreateSystemDefaultDevice();
     _layer.opaque = false;
-    _layer.contentsScale = pd;
+    _layer.contentsScale = 3;
     _layer.pixelFormat = MTLPixelFormatBGRA8Unorm;
     _layer.contentsGravity = kCAGravityBottomLeft;
-
-    _layer.frame = CGRectMake(0, 0, width, height);
-    _layer.drawableSize = CGSizeMake(width * pd, height * pd);
+    _layer.drawableSize = CGSizeMake(width, height);
   }
 
   ~IOSSkiaContext() {}
@@ -70,11 +66,6 @@ public:
     if (_skSurface) {
       return _skSurface;
     }
-    // Create the Skia Direct Context if it doesn't exist
-    if (!SkiaMetalSurfaceFactory::createSkiaDirectContextIfNecessary(
-            &ThreadContextHolder::ThreadSkiaMetalContext)) {
-      return nullptr;
-    }
 
     // Get the next drawable from the CAMetalLayer
     _currentDrawable = [_layer nextDrawable];
@@ -86,7 +77,7 @@ public:
 
     // Get the texture from the drawable
     _skSurface = SkiaMetalSurfaceFactory::makeWindowedSurface(
-        _currentDrawable.texture, _layer.drawableSize.width,
+        _context, _currentDrawable.texture, _layer.drawableSize.width,
         _layer.drawableSize.height);
     return _skSurface;
   }
@@ -96,15 +87,20 @@ public:
       dContext->flushAndSubmit();
     }
 
-    id<MTLCommandBuffer> commandBuffer(
-        [ThreadContextHolder::ThreadSkiaMetalContext
-                .commandQueue commandBuffer]);
+    id<MTLCommandBuffer> commandBuffer([_context->commandQueue commandBuffer]);
     [commandBuffer presentDrawable:_currentDrawable];
     [commandBuffer commit];
     _skSurface = nullptr;
   }
 
+  void resize(int width, int height) override { _skSurface = nullptr; }
+
+  int getWidth() override { return _layer.frame.size.width; };
+
+  int getHeight() override { return _layer.frame.size.height; };
+
 private:
+  SkiaMetalContext *_context;
   sk_sp<SkSurface> _skSurface = nullptr;
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunguarded-availability-new"

package/ios/RNSkia-iOS/SkiaMetalSurfaceFactory.mm

@@ -21,8 +21,6 @@
 
 #pragma clang diagnostic pop
 
-thread_local SkiaMetalContext ThreadContextHolder::ThreadSkiaMetalContext;
-
 struct OffscreenRenderContext {
   id<MTLTexture> texture;
 
@@ -42,43 +40,14 @@ struct OffscreenRenderContext {
   }
 };
 
-id<MTLDevice> SkiaMetalSurfaceFactory::device = MTLCreateSystemDefaultDevice();
-
-bool SkiaMetalSurfaceFactory::createSkiaDirectContextIfNecessary(
-    SkiaMetalContext *skiaMetalContext) {
-  if (skiaMetalContext->skContext == nullptr) {
-    skiaMetalContext->commandQueue =
-        id<MTLCommandQueue>(CFRetain((GrMTLHandle)[device newCommandQueue]));
-
-    GrMtlBackendContext backendContext = {};
-    backendContext.fDevice.reset((__bridge void *)device);
-    backendContext.fQueue.reset(
-        (__bridge void *)skiaMetalContext->commandQueue);
-    GrContextOptions grContextOptions; // set different options here.
-
-    // Create the Skia Direct Context
-    skiaMetalContext->skContext = GrDirectContexts::MakeMetal(backendContext);
-    if (skiaMetalContext->skContext == nullptr) {
-      RNSkia::RNSkLogger::logToConsole("Couldn't create a Skia Metal Context");
-      return false;
-    }
-  }
-  return true;
-}
-
-std::shared_ptr<RNSkia::SkiaContext>
-SkiaMetalSurfaceFactory::makeContext(CALayer *texture, int width, int height) {
-  return std::make_shared<IOSSkiaContext>(texture, width, height);
+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::makeWindowedSurface(id<MTLTexture> texture, int width,
-                                             int height) {
-  // Get render context for current thread
-  if (!SkiaMetalSurfaceFactory::createSkiaDirectContextIfNecessary(
-          &ThreadContextHolder::ThreadSkiaMetalContext)) {
-    return nullptr;
-  }
+sk_sp<SkSurface> SkiaMetalSurfaceFactory::makeWindowedSurface(
+    SkiaMetalContext *context, id<MTLTexture> texture, int width, int height) {
   GrMtlTextureInfo fbInfo;
   fbInfo.fTexture.retain((__bridge void *)texture);
 
@@ -86,8 +55,8 @@ SkiaMetalSurfaceFactory::makeWindowedSurface(id<MTLTexture> texture, int width,
       GrBackendRenderTargets::MakeMtl(width, height, fbInfo);
 
   auto skSurface = SkSurfaces::WrapBackendRenderTarget(
-      ThreadContextHolder::ThreadSkiaMetalContext.skContext.get(), backendRT,
-      kTopLeft_GrSurfaceOrigin, kBGRA_8888_SkColorType, nullptr, nullptr);
+      context->skContext.get(), backendRT, kTopLeft_GrSurfaceOrigin,
+      kBGRA_8888_SkColorType, nullptr, nullptr);
 
   if (skSurface == nullptr || skSurface->getCanvas() == nullptr) {
     RNSkia::RNSkLogger::logToConsole(
@@ -97,15 +66,11 @@ SkiaMetalSurfaceFactory::makeWindowedSurface(id<MTLTexture> texture, int width,
   return skSurface;
 }
 
-sk_sp<SkSurface> SkiaMetalSurfaceFactory::makeOffscreenSurface(int width,
-                                                               int height) {
-  if (!SkiaMetalSurfaceFactory::createSkiaDirectContextIfNecessary(
-          &ThreadContextHolder::ThreadSkiaMetalContext)) {
-    return nullptr;
-  }
-  auto ctx = new OffscreenRenderContext(
-      device, ThreadContextHolder::ThreadSkiaMetalContext.skContext,
-      ThreadContextHolder::ThreadSkiaMetalContext.commandQueue, 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;
@@ -115,34 +80,27 @@ sk_sp<SkSurface> SkiaMetalSurfaceFactory::makeOffscreenSurface(int width,
 
   // Create a SkSurface from the GrBackendTexture
   auto surface = SkSurfaces::WrapBackendTexture(
-      ThreadContextHolder::ThreadSkiaMetalContext.skContext.get(),
-      backendTexture, kTopLeft_GrSurfaceOrigin, 0, kBGRA_8888_SkColorType,
-      nullptr, nullptr,
+      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(
-    CVPixelBufferRef pixelBuffer) {
-  if (!SkiaMetalSurfaceFactory::createSkiaDirectContextIfNecessary(
-          &ThreadContextHolder::ThreadSkiaMetalContext)) [[unlikely]] {
-    throw std::runtime_error("Failed to create Skia Context for this Thread!");
-  }
-  const SkiaMetalContext &context = ThreadContextHolder::ThreadSkiaMetalContext;
-
+    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);
+        context->skContext.get(), pixelBuffer);
   }
   case SkiaCVPixelBufferUtils::CVPixelBufferBaseFormat::yuv: {
     // CVPixelBuffer is in any YUV format, multi-plane
     return SkiaCVPixelBufferUtils::YUV::makeSkImageFromCVPixelBuffer(
-        context.skContext.get(), pixelBuffer);
+        context->skContext.get(), pixelBuffer);
   }
   default:
     [[unlikely]] {

package/ios/RNSkia-iOS/SkiaUIView.h

@@ -14,8 +14,6 @@
 #import <React/RCTViewComponentView.h>
 #endif // RCT_NEW_ARCH_ENABLED
 
-class RNSkiOSJsView;
-
 @interface SkiaUIView :
 #if RCT_NEW_ARCH_ENABLED
     RCTViewComponentView

package/ios/RNSkia-iOS/ViewScreenshotService.mm

@@ -34,14 +34,7 @@
   UIGraphicsImageRendererFormat *format =
       [UIGraphicsImageRendererFormat defaultFormat];
   format.opaque = NO;
-
-  // Explicitly ask for the standard format to get ARGB 32bits and not 64bits.
-  if (@available(iOS 12.0, *)) {
-    format.preferredRange = UIGraphicsImageRendererFormatRangeStandard;
-  } else {
-    // Fallback on earlier versions
-    format.prefersExtendedRange = false;
-  }
+  format.preferredRange = UIGraphicsImageRendererFormatRangeStandard;
 
   UIGraphicsImageRenderer *renderer =
       [[UIGraphicsImageRenderer alloc] initWithSize:size format:format];

package/lib/commonjs/web/WithSkiaWeb.js

@@ -25,7 +25,10 @@ const WithSkiaWeb = ({
       console.warn("<WithSkiaWeb /> is only necessary on web. Consider not using on native.");
     }
     return getComponent();
-  }), [getComponent, opts]);
+  }),
+  // We we to run this only once.
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  []);
   return /*#__PURE__*/_react.default.createElement(_react.Suspense, {
     fallback: fallback !== null && fallback !== void 0 ? fallback : null
   }, /*#__PURE__*/_react.default.createElement(Inner, componentProps));

package/lib/commonjs/web/WithSkiaWeb.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_Platform","_LoadSkiaWeb","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","WithSkiaWeb","getComponent","fallback","opts","componentProps","Inner","useMemo","lazy","Platform","OS","LoadSkiaWeb","console","warn","createElement","Suspense","exports"],"sources":["WithSkiaWeb.tsx"],"sourcesContent":["import type { ComponentProps, ComponentType } from \"react\";\nimport React, { useMemo, lazy, Suspense } from \"react\";\n\nimport { Platform } from \"../Platform\";\n\nimport { LoadSkiaWeb } from \"./LoadSkiaWeb\";\n\ntype NonOptionalKeys<T> = {\n  [k in keyof T]-?: undefined extends T[k] ? never : k;\n}[keyof T];\n\ntype WithSkiaProps<TProps> = {\n  fallback?: ComponentProps<typeof Suspense>[\"fallback\"];\n  getComponent: () => Promise<{ default: ComponentType<TProps> }>;\n  opts?: Parameters<typeof LoadSkiaWeb>[0];\n} & (NonOptionalKeys<TProps> extends never\n  ? {\n      componentProps?: TProps;\n    }\n  : {\n      componentProps: TProps;\n    });\n\nexport const WithSkiaWeb = <TProps extends object>({\n  getComponent,\n  fallback,\n  opts,\n  componentProps,\n}: WithSkiaProps<TProps>) => {\n  const Inner = useMemo(\n    // TODO: investigate\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    (): any =>\n      lazy(async () => {\n        if (Platform.OS === \"web\") {\n          await LoadSkiaWeb(opts);\n        } else {\n          console.warn(\n            \"<WithSkiaWeb /> is only necessary on web. Consider not using on native.\"\n          );\n        }\n        return getComponent();\n      }),\n    [getComponent, opts]\n  );\n  return (\n    <Suspense fallback={fallback ?? null}>\n      <Inner {...componentProps} />\n    </Suspense>\n  );\n};\n"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAEA,IAAAC,SAAA,GAAAD,OAAA;AAEA,IAAAE,YAAA,GAAAF,OAAA;AAA4C,SAAAG,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAL,wBAAAK,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAkBrC,MAAMW,WAAW,GAAGA,CAAwB;EACjDC,YAAY;EACZC,QAAQ;EACRC,IAAI;EACJC;AACqB,CAAC,KAAK;EAC3B,MAAMC,KAAK,GAAG,IAAAC,cAAO;EACnB;EACA;EACA,mBACE,IAAAC,WAAI,EAAC,YAAY;IACf,IAAIC,kBAAQ,CAACC,EAAE,KAAK,KAAK,EAAE;MACzB,MAAM,IAAAC,wBAAW,EAACP,IAAI,CAAC;IACzB,CAAC,MAAM;MACLQ,OAAO,CAACC,IAAI,CACV,yEACF,CAAC;IACH;IACA,OAAOX,YAAY,CAAC,CAAC;EACvB,CAAC,CAAC,EACJ,CAACA,YAAY,EAAEE,IAAI,CACrB,CAAC;EACD,oBACE5B,MAAA,CAAAW,OAAA,CAAA2B,aAAA,CAACtC,MAAA,CAAAuC,QAAQ;IAACZ,QAAQ,EAAEA,QAAQ,aAARA,QAAQ,cAARA,QAAQ,GAAI;EAAK,gBACnC3B,MAAA,CAAAW,OAAA,CAAA2B,aAAA,CAACR,KAAK,EAAKD,cAAiB,CACpB,CAAC;AAEf,CAAC;AAACW,OAAA,CAAAf,WAAA,GAAAA,WAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_Platform","_LoadSkiaWeb","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","WithSkiaWeb","getComponent","fallback","opts","componentProps","Inner","useMemo","lazy","Platform","OS","LoadSkiaWeb","console","warn","createElement","Suspense","exports"],"sources":["WithSkiaWeb.tsx"],"sourcesContent":["import type { ComponentProps, ComponentType } from \"react\";\nimport React, { useMemo, lazy, Suspense } from \"react\";\n\nimport { Platform } from \"../Platform\";\n\nimport { LoadSkiaWeb } from \"./LoadSkiaWeb\";\n\ntype NonOptionalKeys<T> = {\n  [k in keyof T]-?: undefined extends T[k] ? never : k;\n}[keyof T];\n\ntype WithSkiaProps<TProps> = {\n  fallback?: ComponentProps<typeof Suspense>[\"fallback\"];\n  getComponent: () => Promise<{ default: ComponentType<TProps> }>;\n  opts?: Parameters<typeof LoadSkiaWeb>[0];\n} & (NonOptionalKeys<TProps> extends never\n  ? {\n      componentProps?: TProps;\n    }\n  : {\n      componentProps: TProps;\n    });\n\nexport const WithSkiaWeb = <TProps extends object>({\n  getComponent,\n  fallback,\n  opts,\n  componentProps,\n}: WithSkiaProps<TProps>) => {\n  const Inner = useMemo(\n    // TODO: investigate\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    (): any =>\n      lazy(async () => {\n        if (Platform.OS === \"web\") {\n          await LoadSkiaWeb(opts);\n        } else {\n          console.warn(\n            \"<WithSkiaWeb /> is only necessary on web. Consider not using on native.\"\n          );\n        }\n        return getComponent();\n      }),\n    // We we to run this only once.\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n    []\n  );\n  return (\n    <Suspense fallback={fallback ?? null}>\n      <Inner {...componentProps} />\n    </Suspense>\n  );\n};\n"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAEA,IAAAC,SAAA,GAAAD,OAAA;AAEA,IAAAE,YAAA,GAAAF,OAAA;AAA4C,SAAAG,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAL,wBAAAK,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAkBrC,MAAMW,WAAW,GAAGA,CAAwB;EACjDC,YAAY;EACZC,QAAQ;EACRC,IAAI;EACJC;AACqB,CAAC,KAAK;EAC3B,MAAMC,KAAK,GAAG,IAAAC,cAAO;EACnB;EACA;EACA,mBACE,IAAAC,WAAI,EAAC,YAAY;IACf,IAAIC,kBAAQ,CAACC,EAAE,KAAK,KAAK,EAAE;MACzB,MAAM,IAAAC,wBAAW,EAACP,IAAI,CAAC;IACzB,CAAC,MAAM;MACLQ,OAAO,CAACC,IAAI,CACV,yEACF,CAAC;IACH;IACA,OAAOX,YAAY,CAAC,CAAC;EACvB,CAAC,CAAC;EACJ;EACA;EACA,EACF,CAAC;EACD,oBACE1B,MAAA,CAAAW,OAAA,CAAA2B,aAAA,CAACtC,MAAA,CAAAuC,QAAQ;IAACZ,QAAQ,EAAEA,QAAQ,aAARA,QAAQ,cAARA,QAAQ,GAAI;EAAK,gBACnC3B,MAAA,CAAAW,OAAA,CAAA2B,aAAA,CAACR,KAAK,EAAKD,cAAiB,CACpB,CAAC;AAEf,CAAC;AAACW,OAAA,CAAAf,WAAA,GAAAA,WAAA","ignoreList":[]}

package/lib/module/web/WithSkiaWeb.js

@@ -17,7 +17,10 @@ export const WithSkiaWeb = ({
       console.warn("<WithSkiaWeb /> is only necessary on web. Consider not using on native.");
     }
     return getComponent();
-  }), [getComponent, opts]);
+  }),
+  // We we to run this only once.
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  []);
   return /*#__PURE__*/React.createElement(Suspense, {
     fallback: fallback !== null && fallback !== void 0 ? fallback : null
   }, /*#__PURE__*/React.createElement(Inner, componentProps));