@shopify/react-native-skia 1.6.0 → 1.7.0

package/android/cpp/jni/include/JniSkiaBaseView.h

@@ -55,7 +55,6 @@ protected:
         _skiaAndroidView->getSkiaView()->getNativeId(), nullptr);
     getSkiaManager()->unregisterSkiaView(
         _skiaAndroidView->getSkiaView()->getNativeId());
-    _skiaAndroidView->viewDidUnmount();
   }
 
 private:

package/android/cpp/jni/include/JniSkiaManager.h

@@ -44,8 +44,8 @@ public:
       JniPlatformContext *platformContext)
       : _javaPart(jni::make_global(jThis)), _jsRuntime(runtime),
         _jsCallInvoker(jsCallInvoker),
-        _context(std::make_shared<RNSkAndroidPlatformContext>(
-            platformContext, runtime, jsCallInvoker)) {}
+        _context(std::make_shared<RNSkAndroidPlatformContext>(platformContext,
+                                                              jsCallInvoker)) {}
 
   std::shared_ptr<RNSkAndroidPlatformContext> getPlatformContext() {
     return _context;

package/android/cpp/rnskia-android/MainThreadDispatcher.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <android/looper.h>
-#include <unistd.h>
 #include <queue>
+#include <unistd.h>
 
 class MainThreadDispatcher {
 private:
@@ -28,9 +28,7 @@ public:
     return instance;
   }
 
-  bool isOnMainThread() {
-      return ALooper_forThread() == mainLooper;
-  }
+  bool isOnMainThread() { return ALooper_forThread() == mainLooper; }
 
   void post(std::function<void()> task) {
     // TODO: this is disabled for now but we can clean this up

package/android/cpp/rnskia-android/OpenGLContext.h

@@ -28,15 +28,21 @@ public:
 
   gl::Display *getDisplay() { return _glDisplay.get(); }
   gl::Context *getContext() { return _glContext.get(); }
+  gl::Surface *getSurface() { return _glSurface.get(); };
+  EGLConfig getConfig() { return _glConfig; }
 
 private:
   std::unique_ptr<gl::Display> _glDisplay;
   std::unique_ptr<gl::Context> _glContext;
+  std::unique_ptr<gl::Surface> _glSurface;
+  EGLConfig _glConfig;
 
   OpenGLSharedContext() {
     _glDisplay = std::make_unique<gl::Display>();
-    auto glConfig = _glDisplay->chooseConfig();
-    _glContext = _glDisplay->makeContext(glConfig, nullptr);
+    _glConfig = _glDisplay->chooseConfig();
+    _glContext = _glDisplay->makeContext(_glConfig, nullptr);
+    _glSurface = _glDisplay->makePixelBufferSurface(_glConfig, 1, 1);
+    _glContext->makeCurrent(_glSurface.get());
   }
 };
 
@@ -156,11 +162,13 @@ public:
   std::unique_ptr<WindowContext> MakeWindow(ANativeWindow *window, int width,
                                             int height) {
     auto display = OpenGLSharedContext::getInstance().getDisplay();
-    return std::make_unique<OpenGLWindowContext>(_directContext.get(), display,
-                                                 _glContext.get(), window);
+    return std::make_unique<OpenGLWindowContext>(
+        _directContext.get(), display, _glContext.get(), window,
+        OpenGLSharedContext::getInstance().getConfig());
   }
 
   GrDirectContext *getDirectContext() { return _directContext.get(); }
+  void makeCurrent() { _glContext->makeCurrent(_glSurface.get()); }
 
 private:
   std::unique_ptr<gl::Context> _glContext;
@@ -170,7 +178,7 @@ private:
   OpenGLContext() {
     auto display = OpenGLSharedContext::getInstance().getDisplay();
     auto sharedContext = OpenGLSharedContext::getInstance().getContext();
-    auto glConfig = display->chooseConfig();
+    auto glConfig = OpenGLSharedContext::getInstance().getConfig();
     _glContext = display->makeContext(glConfig, sharedContext);
     _glSurface = display->makePixelBufferSurface(glConfig, 1, 1);
     _glContext->makeCurrent(_glSurface.get());

package/android/cpp/rnskia-android/OpenGLWindowContext.h

@@ -34,11 +34,11 @@ namespace RNSkia {
 class OpenGLWindowContext : public WindowContext {
 public:
   OpenGLWindowContext(GrDirectContext *directContext, gl::Display *display,
-                      gl::Context *glContext, ANativeWindow *window)
+                      gl::Context *glContext, ANativeWindow *window,
+                      EGLConfig config)
       : _directContext(directContext), _display(display), _glContext(glContext),
         _window(window) {
     ANativeWindow_acquire(_window);
-    auto config = display->chooseConfig();
     _glSurface = display->makeWindowSurface(config, _window);
   }
 

package/android/cpp/rnskia-android/RNSkAndroidPlatformContext.h

@@ -20,7 +20,6 @@
 #include "MainThreadDispatcher.h"
 #include "RNSkAndroidVideo.h"
 #include "RNSkPlatformContext.h"
-
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
@@ -34,9 +33,9 @@ namespace jsi = facebook::jsi;
 class RNSkAndroidPlatformContext : public RNSkPlatformContext {
 public:
   RNSkAndroidPlatformContext(
-      JniPlatformContext *jniPlatformContext, jsi::Runtime *runtime,
+      JniPlatformContext *jniPlatformContext,
       std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker)
-      : RNSkPlatformContext(runtime, jsCallInvoker,
+      : RNSkPlatformContext(jsCallInvoker,
                             jniPlatformContext->getPixelDensity()),
         _jniPlatformContext(jniPlatformContext) {}
 
@@ -78,6 +77,31 @@ public:
 #endif
   }
 
+  sk_sp<SkImage> makeImageFromNativeTexture(const TextureInfo &texInfo,
+                                            int width, int height,
+                                            bool mipMapped) override {
+    GrGLTextureInfo textureInfo;
+    textureInfo.fTarget = (GrGLenum)texInfo.glTarget;
+    textureInfo.fID = (GrGLuint)texInfo.glID;
+    textureInfo.fFormat = (GrGLenum)texInfo.glFormat;
+    textureInfo.fProtected =
+        texInfo.glProtected ? skgpu::Protected::kYes : skgpu::Protected::kNo;
+
+    OpenGLContext::getInstance().makeCurrent();
+    if (glIsTexture(textureInfo.fID) == GL_FALSE) {
+      throw new std::runtime_error("Invalid textureInfo");
+    }
+
+    GrBackendTexture backendTexture = GrBackendTextures::MakeGL(
+        width, height,
+        mipMapped ? skgpu::Mipmapped::kYes : skgpu::Mipmapped::kNo,
+        textureInfo);
+    return SkImages::BorrowTextureFrom(
+        OpenGLContext::getInstance().getDirectContext(), backendTexture,
+        kTopLeft_GrSurfaceOrigin, kRGBA_8888_SkColorType, kUnpremul_SkAlphaType,
+        nullptr);
+  }
+
   std::shared_ptr<RNSkVideo> createVideo(const std::string &url) override {
     auto jniVideo = _jniPlatformContext->createVideo(url);
     return std::make_shared<RNSkAndroidVideo>(jniVideo);
@@ -149,6 +173,40 @@ public:
 #endif
   }
 
+  const TextureInfo getTexture(sk_sp<SkImage> image) override {
+    GrBackendTexture texture;
+    if (!SkImages::GetBackendTextureFromImage(image, &texture, true)) {
+      throw std::runtime_error("Couldn't get backend texture from image.");
+    }
+    return getJSITextureInfo(texture);
+  }
+
+  const TextureInfo getTexture(sk_sp<SkSurface> surface) override {
+    GrBackendTexture texture = SkSurfaces::GetBackendTexture(
+        surface.get(), SkSurface::BackendHandleAccess::kFlushRead);
+    return getJSITextureInfo(texture);
+  }
+
+  static const TextureInfo getJSITextureInfo(const GrBackendTexture &texture) {
+    if (!texture.isValid()) {
+      throw std::runtime_error("invalid backend texture");
+    }
+    GrGLTextureInfo textureInfo;
+    if (!GrBackendTextures::GetGLTextureInfo(texture, &textureInfo)) {
+      throw std::runtime_error("couldn't get OpenGL texture");
+    }
+
+    OpenGLContext::getInstance().makeCurrent();
+    glFlush();
+
+    TextureInfo texInfo;
+    texInfo.glProtected = textureInfo.isProtected();
+    texInfo.glID = textureInfo.fID;
+    texInfo.glFormat = textureInfo.fFormat;
+    texInfo.glTarget = textureInfo.fTarget;
+    return texInfo;
+  }
+
 #if !defined(SK_GRAPHITE)
   GrDirectContext *getDirectContext() override {
     return OpenGLContext::getInstance().getDirectContext();

package/android/cpp/rnskia-android/RNSkAndroidView.h

@@ -23,8 +23,6 @@ public:
 
   virtual void setShowDebugInfo(bool show) = 0;
 
-  virtual void viewDidUnmount() = 0;
-
   virtual std::shared_ptr<RNSkView> getSkiaView() = 0;
 };
 
@@ -63,8 +61,6 @@ public:
 
   void setShowDebugInfo(bool show) override { T::setShowDebugOverlays(show); }
 
-  void viewDidUnmount() override {}
-
   std::shared_ptr<RNSkView> getSkiaView() override {
     return T::shared_from_this();
   }

package/android/cpp/rnskia-android/gl/Display.h

@@ -43,6 +43,8 @@ public:
 
     EGLint att[] = {EGL_RENDERABLE_TYPE,
                     EGL_OPENGL_ES2_BIT,
+                    EGL_SURFACE_TYPE,
+                    EGL_WINDOW_BIT | EGL_PBUFFER_BIT,
                     EGL_ALPHA_SIZE,
                     8,
                     EGL_BLUE_SIZE,

package/cpp/api/JsiSkContourMeasure.h

@@ -26,11 +26,7 @@ public:
   JsiSkContourMeasure(std::shared_ptr<RNSkPlatformContext> context,
                       const sk_sp<SkContourMeasure> contourMeasure)
       : JsiSkWrappingSkPtrHostObject(std::move(context),
-                                     std::move(contourMeasure)) {
-    if (contourMeasure == nullptr) {
-      throw jsi::JSError(*context->getJsRuntime(), "Contour measure is null");
-    }
-  }
+                                     std::move(contourMeasure)) {}
 
   JSI_HOST_FUNCTION(getPosTan) {
     auto dist = arguments[0].asNumber();

package/cpp/api/JsiSkImage.h

@@ -10,6 +10,7 @@
 #include "JsiSkShader.h"
 #include "third_party/base64.h"
 
+#include "JsiTextureInfo.h"
 #include "RNSkTypedArray.h"
 
 #if defined(SK_GRAPHITE)
@@ -215,6 +216,15 @@ public:
         runtime, std::make_shared<JsiSkImage>(getContext(), rasterImage));
   }
 
+  JSI_HOST_FUNCTION(getNativeTextureUnstable) {
+    auto image = getObject();
+    if (!image->isTextureBacked()) {
+      return jsi::Value::null();
+    }
+    auto texInfo = getContext()->getTexture(image);
+    return JsiTextureInfo::toValue(runtime, texInfo);
+  }
+
   EXPORT_JSI_API_TYPENAME(JsiSkImage, Image)
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkImage, width),
@@ -226,6 +236,7 @@ public:
                        JSI_EXPORT_FUNC(JsiSkImage, encodeToBase64),
                        JSI_EXPORT_FUNC(JsiSkImage, readPixels),
                        JSI_EXPORT_FUNC(JsiSkImage, makeNonTextureImage),
+                       JSI_EXPORT_FUNC(JsiSkImage, getNativeTextureUnstable),
                        JSI_EXPORT_FUNC(JsiSkImage, dispose))
 
   JsiSkImage(std::shared_ptr<RNSkPlatformContext> context,

package/cpp/api/JsiSkImageFactory.h

@@ -78,10 +78,24 @@ public:
         });
   }
 
+  JSI_HOST_FUNCTION(MakeImageFromNativeTextureUnstable) {
+    auto texInfo = JsiTextureInfo::fromValue(runtime, arguments[0]);
+    auto image = getContext()->makeImageFromNativeTexture(
+        texInfo, arguments[1].asNumber(), arguments[2].asNumber(),
+        count > 3 && arguments[3].asBool());
+    if (image == nullptr) {
+      throw std::runtime_error("Failed to convert native texture to SkImage!");
+    }
+    return jsi::Object::createFromHostObject(
+        runtime, std::make_shared<JsiSkImage>(getContext(), std::move(image)));
+  }
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkImageFactory, MakeImageFromEncoded),
                        JSI_EXPORT_FUNC(JsiSkImageFactory, MakeImageFromViewTag),
                        JSI_EXPORT_FUNC(JsiSkImageFactory,
                                        MakeImageFromNativeBuffer),
+                       JSI_EXPORT_FUNC(JsiSkImageFactory,
+                                       MakeImageFromNativeTextureUnstable),
                        JSI_EXPORT_FUNC(JsiSkImageFactory, MakeImage))
 
   explicit JsiSkImageFactory(std::shared_ptr<RNSkPlatformContext> context)

package/cpp/api/JsiSkPicture.h

@@ -4,6 +4,8 @@
 
 #include "JsiSkData.h"
 #include "JsiSkHostObjects.h"
+#include "JsiSkMatrix.h"
+#include "JsiSkRect.h"
 #include "JsiSkShader.h"
 
 #pragma clang diagnostic push

package/cpp/api/JsiSkSurface.h

@@ -6,6 +6,7 @@
 #include <jsi/jsi.h>
 
 #include "JsiSkHostObjects.h"
+#include "JsiTextureInfo.h"
 
 #include "JsiSkCanvas.h"
 #include "JsiSkImage.h"
@@ -78,11 +79,17 @@ public:
         runtime, std::make_shared<JsiSkImage>(getContext(), std::move(image)));
   }
 
+  JSI_HOST_FUNCTION(getNativeTextureUnstable) {
+    auto texInfo = getContext()->getTexture(getObject());
+    return JsiTextureInfo::toValue(runtime, texInfo);
+  }
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkSurface, width),
                        JSI_EXPORT_FUNC(JsiSkSurface, height),
                        JSI_EXPORT_FUNC(JsiSkSurface, getCanvas),
                        JSI_EXPORT_FUNC(JsiSkSurface, makeImageSnapshot),
                        JSI_EXPORT_FUNC(JsiSkSurface, flush),
+                       JSI_EXPORT_FUNC(JsiSkSurface, getNativeTextureUnstable),
                        JSI_EXPORT_FUNC(JsiSkSurface, dispose))
 };
 

package/cpp/api/JsiTextureInfo.h

@@ -0,0 +1,53 @@
+#pragma once
+
+#include <jsi/jsi.h>
+
+#include "RNSkPlatformContext.h"
+
+namespace jsi = facebook::jsi;
+namespace react = facebook::react;
+
+namespace RNSkia {
+
+namespace JsiTextureInfo {
+
+inline jsi::Value toValue(jsi::Runtime &runtime, const TextureInfo &texInfo) {
+  jsi::Object textureInfo(runtime);
+  textureInfo.setProperty(
+      runtime, "mtlTexture",
+      jsi::BigInt::fromUint64(runtime,
+                              reinterpret_cast<uint64_t>(texInfo.mtlTexture)));
+  textureInfo.setProperty(runtime, "glTarget",
+                          static_cast<int>(texInfo.glTarget));
+  textureInfo.setProperty(runtime, "glID", static_cast<int>(texInfo.glID));
+  textureInfo.setProperty(runtime, "glFormat",
+                          static_cast<int>(texInfo.glFormat));
+  textureInfo.setProperty(runtime, "glProtected",
+                          static_cast<int>(texInfo.glProtected));
+  return textureInfo;
+}
+
+inline TextureInfo fromValue(jsi::Runtime &runtime, const jsi::Value &value) {
+  auto object = value.getObject(runtime);
+  TextureInfo texInfo;
+  if (object.hasProperty(runtime, "mtlTexture")) {
+    texInfo.mtlTexture =
+        reinterpret_cast<const void *>(object.getProperty(runtime, "mtlTexture")
+                                           .asBigInt(runtime)
+                                           .asUint64(runtime));
+  }
+  if (object.hasProperty(runtime, "glID")) {
+    texInfo.glTarget = static_cast<unsigned int>(
+        object.getProperty(runtime, "glTarget").asNumber());
+    texInfo.glID = static_cast<unsigned int>(
+        object.getProperty(runtime, "glID").asNumber());
+    texInfo.glFormat = static_cast<unsigned int>(
+        object.getProperty(runtime, "glFormat").asNumber());
+    texInfo.glProtected =
+        object.getProperty(runtime, "glProtected").asNumber() != 0;
+  }
+  return texInfo;
+}
+
+} // namespace JsiTextureInfo
+} // namespace RNSkia

package/cpp/jsi/ViewProperty.h

@@ -0,0 +1,48 @@
+#pragma once
+
+#include <jsi/jsi.h>
+#include <memory>
+#include <string>
+
+#include "JsiDomRenderNode.h"
+#include "JsiSkPicture.h"
+
+namespace RNJsi {
+namespace jsi = facebook::jsi;
+
+class ViewProperty {
+public:
+  ViewProperty(jsi::Runtime &runtime, const jsi::Value &value) {
+    if (value.isObject()) {
+      auto object = value.asObject(runtime);
+      if (object.isHostObject(runtime)) {
+        auto hostObject = object.asHostObject(runtime);
+        auto dom =
+            std::dynamic_pointer_cast<RNSkia::JsiDomRenderNode>(hostObject);
+        if (dom) {
+          _value = dom;
+        } else {
+          auto jsiPicture =
+              std::dynamic_pointer_cast<RNSkia::JsiSkPicture>(hostObject);
+          if (jsiPicture) {
+            _value = jsiPicture->getObject();
+          }
+        }
+      }
+    }
+  }
+
+  bool isNull() { return std::holds_alternative<nullptr_t>(_value); }
+
+  std::shared_ptr<RNSkia::JsiDomRenderNode> getDomRenderNode() {
+    return std::get<std::shared_ptr<RNSkia::JsiDomRenderNode>>(_value);
+  }
+
+  sk_sp<SkPicture> getPicture() { return std::get<sk_sp<SkPicture>>(_value); }
+
+private:
+  std::variant<nullptr_t, sk_sp<SkPicture>,
+               std::shared_ptr<RNSkia::JsiDomRenderNode>>
+      _value = nullptr;
+};
+} // namespace RNJsi

package/cpp/rnskia/RNSkDomView.h

@@ -9,8 +9,8 @@
 
 #include <jsi/jsi.h>
 
-#include "JsiValueWrapper.h"
 #include "RNSkView.h"
+#include "ViewProperty.h"
 
 #include "JsiDomRenderNode.h"
 #include "RNSkLog.h"
@@ -75,20 +75,17 @@ public:
                      std::bind(&RNSkView::requestRedraw, this), context)) {}
 
   void setJsiProperties(
-      std::unordered_map<std::string, JsiValueWrapper> &props) override {
-
-    RNSkView::setJsiProperties(props);
+      std::unordered_map<std::string, ViewProperty> &props) override {
 
     for (auto &prop : props) {
       if (prop.first == "root") {
         // Save root
-        if (prop.second.isUndefined() || prop.second.isNull()) {
+        if (prop.second.isNull()) {
           std::static_pointer_cast<RNSkDomRenderer>(getRenderer())
               ->setRoot(nullptr);
         } else {
           std::static_pointer_cast<RNSkDomRenderer>(getRenderer())
-              ->setRoot(std::dynamic_pointer_cast<JsiDomRenderNode>(
-                  prop.second.getAsHostObject()));
+              ->setRoot(prop.second.getDomRenderNode());
         }
 
         // Request redraw

package/cpp/rnskia/RNSkJsiViewApi.h

@@ -9,9 +9,9 @@
 #include <vector>
 
 #include "JsiHostObject.h"
-#include "JsiValueWrapper.h"
 #include "RNSkPlatformContext.h"
 #include "RNSkView.h"
+#include "ViewProperty.h"
 #include <jsi/jsi.h>
 
 namespace RNSkia {
@@ -20,7 +20,7 @@ namespace jsi = facebook::jsi;
 using RNSkViewInfo = struct RNSkViewInfo {
   RNSkViewInfo() { view = nullptr; }
   std::shared_ptr<RNSkView> view;
-  std::unordered_map<std::string, RNJsi::JsiValueWrapper> props;
+  std::unordered_map<std::string, RNJsi::ViewProperty> props;
 };
 
 class RNSkJsiViewApi : public RNJsi::JsiHostObject,
@@ -57,7 +57,7 @@ public:
     auto info = getEnsuredViewInfo(nativeId);
 
     info->props.insert_or_assign(arguments[1].asString(runtime).utf8(runtime),
-                                 RNJsi::JsiValueWrapper(runtime, arguments[2]));
+                                 RNJsi::ViewProperty(runtime, arguments[2]));
 
     // Now let's see if we have a view that we can update
     if (info->view != nullptr) {

package/cpp/rnskia/RNSkPictureView.h

@@ -9,8 +9,8 @@
 
 #include <jsi/jsi.h>
 
-#include "JsiValueWrapper.h"
 #include "RNSkView.h"
+#include "ViewProperty.h"
 
 #include "JsiSkPicture.h"
 #include "RNSkLog.h"
@@ -40,19 +40,16 @@ class RNSkPictureRenderer
 public:
   RNSkPictureRenderer(std::function<void()> requestRedraw,
                       std::shared_ptr<RNSkPlatformContext> context)
-      : RNSkRenderer(std::move(requestRedraw)), _platformContext(std::move(context)) {}
+      : RNSkRenderer(std::move(requestRedraw)),
+        _platformContext(std::move(context)) {}
 
   void
   renderImmediate(std::shared_ptr<RNSkCanvasProvider> canvasProvider) override {
     performDraw(canvasProvider);
   }
 
-  void setPicture(std::shared_ptr<jsi::HostObject> picture) {
-    if (picture == nullptr) {
-      _picture = nullptr;
-    } else {
-      _picture = std::dynamic_pointer_cast<JsiSkPicture>(picture)->getObject();
-    }
+  void setPicture(sk_sp<SkPicture> picture) {
+    _picture = picture;
     _requestRedraw();
   }
 
@@ -88,27 +85,20 @@ public:
                 std::bind(&RNSkPictureView::requestRedraw, this), context)) {}
 
   void setJsiProperties(
-      std::unordered_map<std::string, RNJsi::JsiValueWrapper> &props) override {
-
-    RNSkView::setJsiProperties(props);
+      std::unordered_map<std::string, RNJsi::ViewProperty> &props) override {
 
     for (auto &prop : props) {
       if (prop.first == "picture") {
-        if (prop.second.isUndefinedOrNull()) {
+        if (prop.second.isNull()) {
           // Clear picture
           std::static_pointer_cast<RNSkPictureRenderer>(getRenderer())
               ->setPicture(nullptr);
           continue;
-        } else if (prop.second.getType() !=
-                   RNJsi::JsiWrapperValueType::HostObject) {
-          // We expect a function for the picture custom property
-          throw std::runtime_error(
-              "Expected an object for the picture custom property.");
         }
 
         // Save picture
         std::static_pointer_cast<RNSkPictureRenderer>(getRenderer())
-            ->setPicture(prop.second.getAsHostObject());
+            ->setPicture(prop.second.getPicture());
       }
     }
   }

package/cpp/rnskia/RNSkPlatformContext.h

@@ -23,8 +23,6 @@
 
 #pragma clang diagnostic pop
 
-#include <jsi/jsi.h>
-
 #include <ReactCommon/CallInvoker.h>
 
 namespace RNSkia {
@@ -32,16 +30,22 @@ namespace RNSkia {
 namespace jsi = facebook::jsi;
 namespace react = facebook::react;
 
+struct TextureInfo {
+  const void *mtlTexture = nullptr;
+  unsigned int glTarget = 0;
+  unsigned int glID = 0;
+  unsigned int glFormat = 0;
+  bool glProtected = false;
+};
+
 class RNSkPlatformContext {
 public:
   /**
    * Constructor
    */
-  RNSkPlatformContext(jsi::Runtime *runtime,
-                      std::shared_ptr<react::CallInvoker> callInvoker,
+  RNSkPlatformContext(std::shared_ptr<react::CallInvoker> callInvoker,
                       float pixelDensity)
-      : _pixelDensity(pixelDensity), _jsRuntime(runtime),
-        _callInvoker(callInvoker) {}
+      : _pixelDensity(pixelDensity), _callInvoker(callInvoker) {}
 
   virtual ~RNSkPlatformContext() = default;
 
@@ -65,11 +69,6 @@ public:
    */
   virtual sk_sp<SkImage> takeScreenshotFromViewTag(size_t tag) = 0;
 
-  /**
-   Returns the javascript runtime
-   */
-  jsi::Runtime *getJsRuntime() { return _jsRuntime; }
-
   /**
    * Returns an SkStream wrapping the require uri provided.
    * @param sourceUri Uri for the resource to load as a string
@@ -107,6 +106,10 @@ public:
    */
   virtual sk_sp<SkImage> makeImageFromNativeBuffer(void *buffer) = 0;
 
+  virtual sk_sp<SkImage>
+  makeImageFromNativeTexture(const TextureInfo &textureInfo, int width,
+                             int height, bool mipMapped) = 0;
+
 #if !defined(SK_GRAPHITE)
   virtual GrDirectContext *getDirectContext() = 0;
 #endif
@@ -115,6 +118,10 @@ public:
 
   virtual uint64_t makeNativeBuffer(sk_sp<SkImage> image) = 0;
 
+  virtual const TextureInfo getTexture(sk_sp<SkSurface> image) = 0;
+
+  virtual const TextureInfo getTexture(sk_sp<SkImage> image) = 0;
+
   virtual std::shared_ptr<RNSkVideo> createVideo(const std::string &url) = 0;
 
   /**
@@ -154,7 +161,6 @@ public:
 
 private:
   float _pixelDensity;
-  jsi::Runtime *_jsRuntime;
   std::shared_ptr<react::CallInvoker> _callInvoker;
 };
 } // namespace RNSkia

package/cpp/rnskia/RNSkView.h

@@ -6,8 +6,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "JsiValueWrapper.h"
 #include "RNSkPlatformContext.h"
+#include "ViewProperty.h"
 
 #include "JsiSkImage.h"
 #include "JsiSkPoint.h"
@@ -143,14 +143,8 @@ public:
    */
   virtual ~RNSkView() {}
 
-  /**
-   Sets custom properties. Custom properties are properties that are set
-   directly from Javascript without having to go through the async bridge.
-   */
   virtual void setJsiProperties(
-      std::unordered_map<std::string, RNJsi::JsiValueWrapper> &props) {
-    // Nothing here...
-  }
+      std::unordered_map<std::string, RNJsi::ViewProperty> &props) = 0;
 
   void requestRedraw() {
     if (!_redrawRequested) {