@shopify/react-native-skia 1.6.0 → 1.7.1

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

@@ -20,9 +20,9 @@ class JniSkiaBaseView {
 public:
   JniSkiaBaseView(jni::alias_ref<JniSkiaManager::javaobject> skiaManager,
                   std::shared_ptr<RNSkBaseAndroidView> skiaView)
-      : _manager(skiaManager->cthis()), _skiaAndroidView(skiaView) {}
+      : _manager(skiaManager->cthis()), _skiaAndroidView(std::move(skiaView)) {}
 
-  ~JniSkiaBaseView() {}
+  ~JniSkiaBaseView() = default;
 
   std::shared_ptr<RNSkManager> getSkiaManager() {
     return _manager->getSkiaManager();
@@ -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/GrAHardwareBufferUtils.cpp

@@ -41,7 +41,7 @@ GrBackendFormat GetGLBackendFormat(GrDirectContext *dContext,
                                    bool requireKnownFormat) {
   GrBackendApi backend = dContext->backend();
   if (backend != GrBackendApi::kOpenGL) {
-    return GrBackendFormat();
+    return {};
   }
   switch (bufferFormat) {
   // TODO: find out if we can detect, which graphic buffers support
@@ -63,7 +63,7 @@ GrBackendFormat GetGLBackendFormat(GrDirectContext *dContext,
 #endif
   default:
     if (requireKnownFormat) {
-      return GrBackendFormat();
+      return {};
     } else {
       return GrBackendFormats::MakeGL(GR_GL_RGBA8, GR_GL_TEXTURE_EXTERNAL);
     }
@@ -110,12 +110,12 @@ void GLTextureHelper::rebind(GrDirectContext *dContext) {
 }
 
 void delete_gl_texture(void *context) {
-  GLTextureHelper *cleanupHelper = static_cast<GLTextureHelper *>(context);
+  auto cleanupHelper = static_cast<GLTextureHelper *>(context);
   delete cleanupHelper;
 }
 
 void update_gl_texture(void *context, GrDirectContext *dContext) {
-  GLTextureHelper *cleanupHelper = static_cast<GLTextureHelper *>(context);
+  auto cleanupHelper = static_cast<GLTextureHelper *>(context);
   cleanupHelper->rebind(dContext);
 }
 
@@ -127,13 +127,13 @@ static GrBackendTexture make_gl_backend_texture(
   while (GL_NO_ERROR != glGetError()) {
   } // clear GL errors
 
-  EGLGetNativeClientBufferANDROIDProc eglGetNativeClientBufferANDROID =
+  auto eglGetNativeClientBufferANDROID =
       (EGLGetNativeClientBufferANDROIDProc)eglGetProcAddress(
           "eglGetNativeClientBufferANDROID");
   if (!eglGetNativeClientBufferANDROID) {
     RNSkLogger::logToConsole(
         "Failed to get the eglGetNativeClientBufferAndroid proc");
-    return GrBackendTexture();
+    return {};
   }
 
   EGLClientBuffer clientBuffer =
@@ -149,14 +149,14 @@ static GrBackendTexture make_gl_backend_texture(
   if (EGL_NO_IMAGE_KHR == image) {
     SkDebugf("Could not create EGL image, err = (%#x)",
              static_cast<int>(eglGetError()));
-    return GrBackendTexture();
+    return {};
   }
 
   GrGLuint texID;
   glGenTextures(1, &texID);
   if (!texID) {
     eglDestroyImageKHR(display, image);
-    return GrBackendTexture();
+    return {};
   }
 
   GrGLuint target = isRenderable ? GR_GL_TEXTURE_2D : GR_GL_TEXTURE_EXTERNAL;
@@ -167,7 +167,7 @@ static GrBackendTexture make_gl_backend_texture(
     SkDebugf("glBindTexture failed (%#x)", static_cast<int>(status));
     glDeleteTextures(1, &texID);
     eglDestroyImageKHR(display, image);
-    return GrBackendTexture();
+    return {};
   }
   glEGLImageTargetTexture2DOES(target, image);
   if ((status = glGetError()) != GL_NO_ERROR) {
@@ -175,7 +175,7 @@ static GrBackendTexture make_gl_backend_texture(
              static_cast<int>(status));
     glDeleteTextures(1, &texID);
     eglDestroyImageKHR(display, image);
-    return GrBackendTexture();
+    return {};
   }
   dContext->resetContext(kTextureBinding_GrGLBackendState);
 
@@ -223,16 +223,16 @@ MakeGLBackendTexture(GrDirectContext *dContext, AHardwareBuffer *hardwareBuffer,
                      bool isProtectedContent,
                      const GrBackendFormat &backendFormat, bool isRenderable) {
   SkASSERT(dContext);
-  if (!dContext || dContext->abandoned()) {
-    return GrBackendTexture();
+  if (dContext->abandoned()) {
+    return {};
   }
 
   if (GrBackendApi::kOpenGL != dContext->backend()) {
-    return GrBackendTexture();
+    return {};
   }
 
   if (isProtectedContent && !can_import_protected_content(dContext)) {
-    return GrBackendTexture();
+    return {};
   }
 
   return make_gl_backend_texture(

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

@@ -1,13 +1,13 @@
 #pragma once
 
 #include <android/looper.h>
-#include <unistd.h>
 #include <queue>
+#include <unistd.h>
 
 class MainThreadDispatcher {
 private:
-  ALooper *mainLooper;
-  int messagePipe[2];
+  ALooper *mainLooper = nullptr;
+  int messagePipe[2] = { -1, -1 };
   std::queue<std::function<void()>> taskQueue;
   std::mutex queueMutex;
 
@@ -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());
   }
 };
 
@@ -111,17 +117,23 @@ public:
     // GR_GL_TEXTURE_2D
     case AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM:
       format = GrBackendFormats::MakeGL(GR_GL_RGBA8, GR_GL_TEXTURE_EXTERNAL);
+      break;
     case AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT:
       format = GrBackendFormats::MakeGL(GR_GL_RGBA16F, GR_GL_TEXTURE_EXTERNAL);
+      break;
     case AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM:
-      format = GrBackendFormats::MakeGL(GR_GL_RGB565, GR_GL_TEXTURE_EXTERNAL);
+        GrBackendFormats::MakeGL(GR_GL_RGB565, GR_GL_TEXTURE_EXTERNAL);
+        break;
     case AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM:
       format = GrBackendFormats::MakeGL(GR_GL_RGB10_A2, GR_GL_TEXTURE_EXTERNAL);
+      break;
     case AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM:
       format = GrBackendFormats::MakeGL(GR_GL_RGB8, GR_GL_TEXTURE_EXTERNAL);
+      break;
 #if __ANDROID_API__ >= 33
     case AHARDWAREBUFFER_FORMAT_R8_UNORM:
       format = GrBackendFormats::MakeGL(GR_GL_R8, GR_GL_TEXTURE_EXTERNAL);
+      break;
 #endif
     default:
       if (requireKnownFormat) {
@@ -130,10 +142,11 @@ public:
         format = GrBackendFormats::MakeGL(GR_GL_RGBA8, GR_GL_TEXTURE_EXTERNAL);
       }
     }
-
+    auto width = static_cast<int>(description.width);
+    auto height = static_cast<int>(description.height);
     auto backendTex = MakeGLBackendTexture(
         _directContext.get(), const_cast<AHardwareBuffer *>(hardwareBuffer),
-        description.width, description.height, &deleteImageProc,
+        width, height, &deleteImageProc,
         &updateImageProc, &deleteImageCtx, false, format, false);
     if (!backendTex.isValid()) {
       RNSkLogger::logToConsole(
@@ -153,14 +166,15 @@ public:
   }
 
   // TODO: remove width, height
-  std::unique_ptr<WindowContext> MakeWindow(ANativeWindow *window, int width,
-                                            int height) {
+  std::unique_ptr<WindowContext> MakeWindow(ANativeWindow *window) {
     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 +184,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,15 +34,15 @@ 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);
   }
 
-  ~OpenGLWindowContext() {
+  ~OpenGLWindowContext() override {
     _skSurface = nullptr;
     _glSurface = nullptr;
     ANativeWindow_release(_window);

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

@@ -1,6 +1,5 @@
 #pragma once
 
-// TODO: Add android flags
 #if __ANDROID_API__ >= 26
 #include <android/hardware_buffer.h>
 #endif
@@ -20,7 +19,6 @@
 #include "MainThreadDispatcher.h"
 #include "RNSkAndroidVideo.h"
 #include "RNSkPlatformContext.h"
-
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
@@ -29,18 +27,17 @@
 #pragma clang diagnostic pop
 
 namespace RNSkia {
-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(std::move(jsCallInvoker),
                             jniPlatformContext->getPixelDensity()),
         _jniPlatformContext(jniPlatformContext) {}
 
-  ~RNSkAndroidPlatformContext() {}
+  ~RNSkAndroidPlatformContext() override = default;
 
   void performStreamOperation(
       const std::string &sourceUri,
@@ -66,7 +63,7 @@ public:
     return DawnContext::getInstance().MakeWindow(surface, width, height);
 #else
     auto aWindow = reinterpret_cast<ANativeWindow *>(surface);
-    return OpenGLContext::getInstance().MakeWindow(aWindow, width, height);
+    return OpenGLContext::getInstance().MakeWindow(aWindow);
 #endif
   }
 
@@ -78,6 +75,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 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);
@@ -85,7 +107,7 @@ public:
 
   void releaseNativeBuffer(uint64_t pointer) override {
 #if __ANDROID_API__ >= 26
-    AHardwareBuffer *buffer = reinterpret_cast<AHardwareBuffer *>(pointer);
+    auto *buffer = reinterpret_cast<AHardwareBuffer *>(pointer);
     AHardwareBuffer_release(buffer);
 #endif
   }
@@ -149,6 +171,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 getTextureInfo(texture);
+  }
+
+  const TextureInfo getTexture(sk_sp<SkSurface> surface) override {
+    GrBackendTexture texture = SkSurfaces::GetBackendTexture(
+        surface.get(), SkSurface::BackendHandleAccess::kFlushRead);
+    return getTextureInfo(texture);
+  }
+
+  static TextureInfo getTextureInfo(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/RNSkAndroidVideo.cpp

@@ -35,7 +35,7 @@ RNSkAndroidVideo::RNSkAndroidVideo(jni::global_ref<jobject> jniVideo)
 #endif
 }
 
-RNSkAndroidVideo::~RNSkAndroidVideo() {}
+RNSkAndroidVideo::~RNSkAndroidVideo() = default;
 
 sk_sp<SkImage> RNSkAndroidVideo::nextImage(double *timeStamp) {
 #if __ANDROID_API__ >= 26

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

@@ -26,7 +26,7 @@ private:
 
 public:
   explicit RNSkAndroidVideo(jni::global_ref<jobject> jniVideo);
-  ~RNSkAndroidVideo();
+  ~RNSkAndroidVideo() override;
   sk_sp<SkImage> nextImage(double *timeStamp = nullptr) override;
   double duration() override;
   double framerate() override;

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/RNSkOpenGLCanvasProvider.cpp

@@ -26,9 +26,9 @@ namespace RNSkia {
 RNSkOpenGLCanvasProvider::RNSkOpenGLCanvasProvider(
     std::function<void()> requestRedraw,
     std::shared_ptr<RNSkia::RNSkPlatformContext> platformContext)
-    : RNSkCanvasProvider(requestRedraw), _platformContext(platformContext) {}
+    : RNSkCanvasProvider(std::move(requestRedraw)), _platformContext(std::move(platformContext)) {}
 
-RNSkOpenGLCanvasProvider::~RNSkOpenGLCanvasProvider() {}
+RNSkOpenGLCanvasProvider::~RNSkOpenGLCanvasProvider() = default;
 
 float RNSkOpenGLCanvasProvider::getScaledWidth() {
   if (_surfaceHolder) {
@@ -110,7 +110,7 @@ void RNSkOpenGLCanvasProvider::surfaceAvailable(jobject jSurfaceTexture,
   _surfaceHolder = DawnContext::getInstance().MakeWindow(window, width, height);
 #else
   _surfaceHolder =
-      OpenGLContext::getInstance().MakeWindow(window, width, height);
+      OpenGLContext::getInstance().MakeWindow(window);
 #endif
 
   // Post redraw request to ensure we paint in the next draw cycle.

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/JsiSkApi.h

@@ -64,7 +64,7 @@ public:
    * and provide functions for accessing and creating the Skia wrapper objects
    * @param context Platform context
    */
-  JsiSkApi(jsi::Runtime &runtime, std::shared_ptr<RNSkPlatformContext> context)
+  explicit JsiSkApi(const std::shared_ptr<RNSkPlatformContext> &context)
       : JsiSkHostObject(context) {
     // We create the system font manager eagerly since it has proven to be too
     // slow to do it on demand

package/cpp/api/JsiSkCanvas.h

@@ -83,7 +83,7 @@ public:
     auto src = JsiSkRect::fromValue(runtime, arguments[1]);
     auto dest = JsiSkRect::fromValue(runtime, arguments[2]);
     auto paint = JsiSkPaint::fromValue(runtime, arguments[3]);
-    auto fastSample = count < 5 ? false : arguments[4].getBool();
+    auto fastSample = count >= 5 && arguments[4].getBool();
     _canvas->drawImageRect(image, *src, *dest, SkSamplingOptions(), paint.get(),
                            fastSample ? SkCanvas::kFast_SrcRectConstraint
                                       : SkCanvas::kStrict_SrcRectConstraint);

package/cpp/api/JsiSkColor.h

@@ -24,7 +24,7 @@ class JsiSkColor : public RNJsi::JsiHostObject {
 public:
   JsiSkColor() : JsiHostObject() {}
 
-  ~JsiSkColor() {}
+  ~JsiSkColor() override = default;
 
   static jsi::Object toValue(jsi::Runtime &runtime, SkColor color) {
     auto result = runtime.global()
@@ -63,7 +63,7 @@ public:
    * @return A function for creating a new host object wrapper for the SkColor
    * class
    */
-  static const jsi::HostFunctionType createCtor() {
+  static jsi::HostFunctionType createCtor() {
     return JSI_HOST_FUNCTION_LAMBDA {
       if (arguments[0].isNumber()) {
         return JsiSkColor::toValue(runtime, arguments[0].getNumber());

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