@shopify/react-native-skia 0.1.200 → 0.1.201

package/android/CMakeLists.txt

@@ -45,7 +45,7 @@ add_library(
 
         "${PROJECT_SOURCE_DIR}/cpp/jni/JniPlatformContext.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/RNSkOpenGLCanvasProvider.cpp"
-        "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/SkiaOpenGLRenderer.cpp"
+        "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/SkiaOpenGLSurfaceFactory.cpp"
 
         "${PROJECT_SOURCE_DIR}/../cpp/jsi/JsiHostObject.cpp"
         "${PROJECT_SOURCE_DIR}/../cpp/jsi/JsiValue.cpp"

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

@@ -10,6 +10,8 @@
 #include <JniSkiaManager.h>
 #include <RNSkAndroidView.h>
 
+#include <android/bitmap.h>
+
 namespace RNSkia {
 
 namespace jsi = facebook::jsi;
@@ -18,7 +20,7 @@ class JniSkiaBaseView {
 public:
   JniSkiaBaseView(jni::alias_ref<JniSkiaManager::javaobject> skiaManager,
                   std::shared_ptr<RNSkBaseAndroidView> skiaView)
-      : _manager(skiaManager->cthis()), _skiaView(skiaView) {}
+      : _manager(skiaManager->cthis()), _skiaAndroidView(skiaView) {}
 
   ~JniSkiaBaseView() {}
 
@@ -28,38 +30,97 @@ public:
 
 protected:
   virtual void updateTouchPoints(jni::JArrayDouble touches) {
-    _skiaView->updateTouchPoints(touches);
+    _skiaAndroidView->updateTouchPoints(touches);
   }
 
   virtual void surfaceAvailable(jobject surface, int width, int height) {
-    _skiaView->surfaceAvailable(surface, width, height);
+    _skiaAndroidView->surfaceAvailable(surface, width, height);
   }
 
   virtual void surfaceSizeChanged(int width, int height) {
-    _skiaView->surfaceSizeChanged(width, height);
+    _skiaAndroidView->surfaceSizeChanged(width, height);
   }
 
-  virtual void surfaceDestroyed() { _skiaView->surfaceDestroyed(); }
+  virtual void surfaceDestroyed() { _skiaAndroidView->surfaceDestroyed(); }
 
-  virtual void setMode(std::string mode) { _skiaView->setMode(mode); }
+  virtual void setMode(std::string mode) { _skiaAndroidView->setMode(mode); }
 
-  virtual void setDebugMode(bool show) { _skiaView->setShowDebugInfo(show); }
+  virtual void setDebugMode(bool show) {
+    _skiaAndroidView->setShowDebugInfo(show);
+  }
 
   virtual void registerView(int nativeId) {
-    getSkiaManager()->registerSkiaView(nativeId, _skiaView->getSkiaView());
+    getSkiaManager()->registerSkiaView(nativeId,
+                                       _skiaAndroidView->getSkiaView());
   }
 
   virtual void unregisterView() {
-    getSkiaManager()->setSkiaView(_skiaView->getSkiaView()->getNativeId(),
-                                  nullptr);
+    getSkiaManager()->setSkiaView(
+        _skiaAndroidView->getSkiaView()->getNativeId(), nullptr);
     getSkiaManager()->unregisterSkiaView(
-        _skiaView->getSkiaView()->getNativeId());
-    _skiaView->viewDidUnmount();
+        _skiaAndroidView->getSkiaView()->getNativeId());
+    _skiaAndroidView->viewDidUnmount();
   }
 
+  /**
+   * Android specific method for rendering an offscreen GPU buffer to an Android
+   * bitmap. The result can be used to render the first frame of the Skia render
+   * to avoid flickering on android.
+   */
+  /*
+   // TODO: Remove if we find another solution for first frame rendering
+    // protected native Object renderToBitmap(Object bitmap, int width, int
+  height); virtual jobject renderToBitmap(jobject bitmapIn, int width, int
+  height) { auto platformContext = getSkiaManager()->getPlatformContext(); auto
+  provider = std::make_shared<RNSkOffscreenCanvasProvider>( platformContext,
+  []() {}, width, height);
+
+    // Render into a gpu backed buffer
+    _skiaAndroidView->getSkiaView()->getRenderer()->renderImmediate(provider);
+    auto rect = SkRect::MakeXYWH(0, 0, width, height);
+    auto image = provider->makeSnapshot(&rect);
+
+    AndroidBitmapInfo infoIn;
+    auto env = facebook::jni::Environment::current();
+    void *pixels;
+
+    // Get image info
+    if (AndroidBitmap_getInfo(env, bitmapIn, &infoIn) !=
+        ANDROID_BITMAP_RESULT_SUCCESS) {
+      return env->NewStringUTF("failed");
+    }
+
+    // Check image
+    if (infoIn.format != ANDROID_BITMAP_FORMAT_RGBA_8888 &&
+        infoIn.format != ANDROID_BITMAP_FORMAT_RGB_565) {
+      return env->NewStringUTF("Only support ANDROID_BITMAP_FORMAT_RGBA_8888 "
+                               "and ANDROID_BITMAP_FORMAT_RGB_565");
+    }
+
+    auto imageInfo = SkImageInfo::Make(image->width(), image->height(),
+                                       image->colorType(), image->alphaType());
+
+    // Lock all images
+    if (AndroidBitmap_lockPixels(env, bitmapIn, &pixels) !=
+        ANDROID_BITMAP_RESULT_SUCCESS) {
+      return env->NewStringUTF("AndroidBitmap_lockPixels failed!");
+    }
+
+    // Set pixels from SkImage
+    image->readPixels(imageInfo, pixels, imageInfo.minRowBytes(), 0, 0);
+
+    // Unlocks everything
+    AndroidBitmap_unlockPixels(env, bitmapIn);
+
+    image = nullptr;
+    provider = nullptr;
+
+    return bitmapIn;
+  }*/
+
 private:
   JniSkiaManager *_manager;
-  std::shared_ptr<RNSkBaseAndroidView> _skiaView;
+  std::shared_ptr<RNSkBaseAndroidView> _skiaAndroidView;
 };
 
 } // namespace RNSkia

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

@@ -34,18 +34,21 @@ public:
   }
 
   static void registerNatives() {
-    registerHybrid(
-        {makeNativeMethod("initHybrid", JniSkiaDomView::initHybrid),
-         makeNativeMethod("surfaceAvailable", JniSkiaDomView::surfaceAvailable),
-         makeNativeMethod("surfaceDestroyed", JniSkiaDomView::surfaceDestroyed),
-         makeNativeMethod("surfaceSizeChanged",
-                          JniSkiaDomView::surfaceSizeChanged),
-         makeNativeMethod("setMode", JniSkiaDomView::setMode),
-         makeNativeMethod("setDebugMode", JniSkiaDomView::setDebugMode),
-         makeNativeMethod("updateTouchPoints",
-                          JniSkiaDomView::updateTouchPoints),
-         makeNativeMethod("registerView", JniSkiaDomView::registerView),
-         makeNativeMethod("unregisterView", JniSkiaDomView::unregisterView)});
+    registerHybrid({
+        makeNativeMethod("initHybrid", JniSkiaDomView::initHybrid),
+        makeNativeMethod("surfaceAvailable", JniSkiaDomView::surfaceAvailable),
+        makeNativeMethod("surfaceDestroyed", JniSkiaDomView::surfaceDestroyed),
+        makeNativeMethod("surfaceSizeChanged",
+                         JniSkiaDomView::surfaceSizeChanged),
+        makeNativeMethod("setMode", JniSkiaDomView::setMode),
+        makeNativeMethod("setDebugMode", JniSkiaDomView::setDebugMode),
+        makeNativeMethod("updateTouchPoints",
+                         JniSkiaDomView::updateTouchPoints),
+        makeNativeMethod("registerView", JniSkiaDomView::registerView),
+        makeNativeMethod("unregisterView", JniSkiaDomView::unregisterView)
+        // TODO: Remove if we find another solution for first frame rendering
+        // makeNativeMethod("renderToBitmap", JniSkiaDomView::renderToBitmap)
+    });
   }
 
 protected:
@@ -73,6 +76,11 @@ protected:
 
   void unregisterView() override { JniSkiaBaseView::unregisterView(); }
 
+  // TODO: Remove if we find another solution for first frame rendering
+  /*jobject renderToBitmap(jobject bitmap, int width, int height) override {
+    return JniSkiaBaseView::renderToBitmap(bitmap, width, height);
+  }*/
+
 private:
   friend HybridBase;
 

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

@@ -33,20 +33,21 @@ public:
   }
 
   static void registerNatives() {
-    registerHybrid(
-        {makeNativeMethod("initHybrid", JniSkiaDrawView::initHybrid),
-         makeNativeMethod("surfaceAvailable",
-                          JniSkiaDrawView::surfaceAvailable),
-         makeNativeMethod("surfaceDestroyed",
-                          JniSkiaDrawView::surfaceDestroyed),
-         makeNativeMethod("surfaceSizeChanged",
-                          JniSkiaDrawView::surfaceSizeChanged),
-         makeNativeMethod("setMode", JniSkiaDrawView::setMode),
-         makeNativeMethod("setDebugMode", JniSkiaDrawView::setDebugMode),
-         makeNativeMethod("updateTouchPoints",
-                          JniSkiaDrawView::updateTouchPoints),
-         makeNativeMethod("registerView", JniSkiaDrawView::registerView),
-         makeNativeMethod("unregisterView", JniSkiaDrawView::unregisterView)});
+    registerHybrid({
+        makeNativeMethod("initHybrid", JniSkiaDrawView::initHybrid),
+        makeNativeMethod("surfaceAvailable", JniSkiaDrawView::surfaceAvailable),
+        makeNativeMethod("surfaceDestroyed", JniSkiaDrawView::surfaceDestroyed),
+        makeNativeMethod("surfaceSizeChanged",
+                         JniSkiaDrawView::surfaceSizeChanged),
+        makeNativeMethod("setMode", JniSkiaDrawView::setMode),
+        makeNativeMethod("setDebugMode", JniSkiaDrawView::setDebugMode),
+        makeNativeMethod("updateTouchPoints",
+                         JniSkiaDrawView::updateTouchPoints),
+        makeNativeMethod("registerView", JniSkiaDrawView::registerView),
+        makeNativeMethod("unregisterView", JniSkiaDrawView::unregisterView),
+        // TODO: Remove if we find another solution for first frame rendering
+        // makeNativeMethod("renderToBitmap", JniSkiaDrawView::renderToBitmap)
+    });
   }
 
 protected:
@@ -74,6 +75,11 @@ protected:
 
   void unregisterView() override { JniSkiaBaseView::unregisterView(); }
 
+  // TODO: Remove if we find another solution for first frame rendering
+  /*jobject renderToBitmap(jobject bitmap, int width, int height) override {
+    return JniSkiaBaseView::renderToBitmap(bitmap, width, height);
+  }*/
+
 private:
   friend HybridBase;
 

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

@@ -33,21 +33,24 @@ public:
   }
 
   static void registerNatives() {
-    registerHybrid(
-        {makeNativeMethod("initHybrid", JniSkiaPictureView::initHybrid),
-         makeNativeMethod("surfaceAvailable",
-                          JniSkiaPictureView::surfaceAvailable),
-         makeNativeMethod("surfaceDestroyed",
-                          JniSkiaPictureView::surfaceDestroyed),
-         makeNativeMethod("surfaceSizeChanged",
-                          JniSkiaPictureView::surfaceSizeChanged),
-         makeNativeMethod("setMode", JniSkiaPictureView::setMode),
-         makeNativeMethod("setDebugMode", JniSkiaPictureView::setDebugMode),
-         makeNativeMethod("updateTouchPoints",
-                          JniSkiaPictureView::updateTouchPoints),
-         makeNativeMethod("registerView", JniSkiaPictureView::registerView),
-         makeNativeMethod("unregisterView",
-                          JniSkiaPictureView::unregisterView)});
+    registerHybrid({
+        makeNativeMethod("initHybrid", JniSkiaPictureView::initHybrid),
+        makeNativeMethod("surfaceAvailable",
+                         JniSkiaPictureView::surfaceAvailable),
+        makeNativeMethod("surfaceDestroyed",
+                         JniSkiaPictureView::surfaceDestroyed),
+        makeNativeMethod("surfaceSizeChanged",
+                         JniSkiaPictureView::surfaceSizeChanged),
+        makeNativeMethod("setMode", JniSkiaPictureView::setMode),
+        makeNativeMethod("setDebugMode", JniSkiaPictureView::setDebugMode),
+        makeNativeMethod("updateTouchPoints",
+                         JniSkiaPictureView::updateTouchPoints),
+        makeNativeMethod("registerView", JniSkiaPictureView::registerView),
+        makeNativeMethod("unregisterView", JniSkiaPictureView::unregisterView),
+        // TODO: Remove if we find another solution for first frame rendering
+        // makeNativeMethod("renderToBitmap",
+        //                 JniSkiaPictureView::renderToBitmap)
+    });
   }
 
 protected:
@@ -75,6 +78,12 @@ protected:
 
   void unregisterView() override { JniSkiaBaseView::unregisterView(); }
 
+  /*
+  TODO: Remove if we find another solution for first frame rendering
+  jobject renderToBitmap(jobject bitmap, int width, int height) override {
+    return JniSkiaBaseView::renderToBitmap(bitmap, width, height);
+  }*/
+
 private:
   friend HybridBase;
 

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

@@ -7,7 +7,7 @@
 
 #include <JniPlatformContext.h>
 #include <RNSkPlatformContext.h>
-#include <SkiaOpenGLRenderer.h>
+#include <SkiaOpenGLSurfaceFactory.h>
 
 namespace RNSkia {
 namespace jsi = facebook::jsi;
@@ -38,7 +38,7 @@ public:
   }
 
   sk_sp<SkSurface> makeOffscreenSurface(int width, int height) override {
-    return MakeOffscreenGLSurface(width, height);
+    return SkiaOpenGLSurfaceFactory::makeOffscreenSurface(width, height);
   }
 
   void runOnMainThread(std::function<void()> task) override {

package/android/cpp/rnskia-android/RNSkOpenGLCanvasProvider.cpp

@@ -14,64 +14,60 @@ namespace RNSkia {
 
 RNSkOpenGLCanvasProvider::RNSkOpenGLCanvasProvider(
     std::function<void()> requestRedraw,
-    std::shared_ptr<RNSkia::RNSkPlatformContext> context)
-    : RNSkCanvasProvider(requestRedraw), _context(context) {}
+    std::shared_ptr<RNSkia::RNSkPlatformContext> platformContext)
+    : RNSkCanvasProvider(requestRedraw), _platformContext(platformContext) {}
 
 RNSkOpenGLCanvasProvider::~RNSkOpenGLCanvasProvider() {}
 
-float RNSkOpenGLCanvasProvider::getScaledWidth() { return _width; }
+float RNSkOpenGLCanvasProvider::getScaledWidth() {
+  return _surfaceHolder ? _surfaceHolder->getWidth() : 0;
+}
 
-float RNSkOpenGLCanvasProvider::getScaledHeight() { return _height; }
+float RNSkOpenGLCanvasProvider::getScaledHeight() {
+  return _surfaceHolder ? _surfaceHolder->getHeight() : 0;
+}
 
 bool RNSkOpenGLCanvasProvider::renderToCanvas(
     const std::function<void(SkCanvas *)> &cb) {
-  if (_renderer != nullptr) {
-    return _renderer->run(cb, _width, _height);
+
+  if (_surfaceHolder != nullptr && cb != nullptr) {
+    // Get the surface
+    auto surface = _surfaceHolder->getSurface();
+    if (surface) {
+
+      // Ensure we are ready to render
+      if (!_surfaceHolder->makeCurrent()) {
+        return false;
+      }
+
+      // Draw into canvas using callback
+      cb(surface->getCanvas());
+
+      // Swap buffers and show on screen
+      return _surfaceHolder->present();
+
+    } else {
+      // the render context did not provide a surface
+      return false;
+    }
   }
+
   return false;
 }
 
 void RNSkOpenGLCanvasProvider::surfaceAvailable(jobject surface, int width,
                                                 int height) {
-  _width = width;
-  _height = height;
-
-  if (_renderer == nullptr) {
-    // Create renderer!
-    _renderer = std::make_unique<SkiaOpenGLRenderer>(surface);
+  // Create renderer!
+  _surfaceHolder =
+      SkiaOpenGLSurfaceFactory::makeWindowedSurface(surface, width, height);
 
-    // Redraw
-    _requestRedraw();
-  }
+  // Post redraw request to ensure we paint in the next draw cycle.
+  _requestRedraw();
 }
 void RNSkOpenGLCanvasProvider::surfaceDestroyed() {
-  if (_renderer != nullptr) {
-    // teardown
-    _renderer->teardown();
-
-    // Teardown renderer on the render thread since OpenGL demands
-    // same thread access for OpenGL contexts.
-    std::condition_variable cv;
-    std::mutex m;
-    std::unique_lock<std::mutex> lock(m);
-
-    _context->runOnRenderThread([&cv, &m, weakSelf = weak_from_this()]() {
-      // Lock
-      std::unique_lock<std::mutex> lock(m);
-
-      auto self = weakSelf.lock();
-      if (self) {
-        if (self->_renderer != nullptr) {
-          self->_renderer->run(nullptr, 0, 0);
-        }
-        // Remove renderer
-        self->_renderer = nullptr;
-      }
-      cv.notify_one();
-    });
-
-    cv.wait(lock);
-  }
+  // destroy the renderer (a unique pointer so the dtor will be called
+  // immediately.)
+  _surfaceHolder = nullptr;
 }
 
 void RNSkOpenGLCanvasProvider::surfaceSizeChanged(int width, int height) {
@@ -80,8 +76,9 @@ void RNSkOpenGLCanvasProvider::surfaceSizeChanged(int width, int height) {
     // it comes to invalidating the surface.
     return;
   }
-  _width = width;
-  _height = height;
+
+  // Recreate RenderContext surface based on size change???
+  _surfaceHolder->resize(width, height);
 
   // Redraw after size change
   _requestRedraw();

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

@@ -6,7 +6,7 @@
 
 #include <RNSkJsView.h>
 
-#include "SkiaOpenGLRenderer.h"
+#include "SkiaOpenGLSurfaceFactory.h"
 #include <android/native_window.h>
 
 namespace RNSkia {
@@ -17,7 +17,7 @@ class RNSkOpenGLCanvasProvider
 public:
   RNSkOpenGLCanvasProvider(
       std::function<void()> requestRedraw,
-      std::shared_ptr<RNSkia::RNSkPlatformContext> context);
+      std::shared_ptr<RNSkia::RNSkPlatformContext> platformContext);
 
   ~RNSkOpenGLCanvasProvider();
 
@@ -34,9 +34,7 @@ public:
   void surfaceSizeChanged(int width, int height);
 
 private:
-  std::unique_ptr<SkiaOpenGLRenderer> _renderer = nullptr;
-  std::shared_ptr<RNSkPlatformContext> _context;
-  float _width = -1;
-  float _height = -1;
+  std::unique_ptr<WindowSurfaceHolder> _surfaceHolder = nullptr;
+  std::shared_ptr<RNSkPlatformContext> _platformContext;
 };
 } // namespace RNSkia