@shopify/react-native-skia 0.1.200 → 0.1.202

package/ios/RNSkia-iOS/ViewScreenshotService.mm

@@ -24,6 +24,7 @@
   auto view = [_uiManager viewForReactTag:viewTag];
   if (view == NULL) {
     RCTFatal(RCTErrorWithMessage(@"Could not find view with tag"));
+    return nullptr;
   }
 
   // Get size

package/package.json

@@ -7,7 +7,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "0.1.200",
+  "version": "0.1.202",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "files": [

package/android/cpp/rnskia-android/SkiaOpenGLRenderer.cpp

@@ -1,347 +0,0 @@
-#include "SkiaOpenGLRenderer.h"
-
-#include <RNSkLog.h>
-#include <android/native_window.h>
-#include <android/native_window_jni.h>
-
-#pragma clang diagnostic push
-
-#define STENCIL_BUFFER_SIZE 8
-
-namespace RNSkia {
-/** Static members */
-sk_sp<SkSurface> MakeOffscreenGLSurface(int width, int height) {
-  EGLDisplay eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-  if (eglDisplay == EGL_NO_DISPLAY) {
-    RNSkLogger::logToConsole("eglGetdisplay failed : %i", glGetError());
-    return nullptr;
-  }
-
-  EGLint major;
-  EGLint minor;
-  if (!eglInitialize(eglDisplay, &major, &minor)) {
-    RNSkLogger::logToConsole("eglInitialize failed : %i", glGetError());
-    return nullptr;
-  }
-
-  EGLint att[] = {EGL_RENDERABLE_TYPE,
-                  EGL_OPENGL_ES2_BIT,
-                  EGL_SURFACE_TYPE,
-                  EGL_PBUFFER_BIT,
-                  EGL_ALPHA_SIZE,
-                  8,
-                  EGL_BLUE_SIZE,
-                  8,
-                  EGL_GREEN_SIZE,
-                  8,
-                  EGL_RED_SIZE,
-                  8,
-                  EGL_DEPTH_SIZE,
-                  0,
-                  EGL_STENCIL_SIZE,
-                  0,
-                  EGL_NONE};
-
-  EGLint numConfigs;
-  EGLConfig eglConfig;
-  eglConfig = 0;
-  if (!eglChooseConfig(eglDisplay, att, &eglConfig, 1, &numConfigs) ||
-      numConfigs == 0) {
-    RNSkLogger::logToConsole("Failed to choose a config %d\n", eglGetError());
-    return nullptr;
-  }
-
-  EGLint contextAttribs[] = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE};
-
-  EGLContext eglContext =
-      eglCreateContext(eglDisplay, eglConfig, NULL, contextAttribs);
-
-  if (eglContext == EGL_NO_CONTEXT) {
-    RNSkLogger::logToConsole("eglCreateContext failed: %d\n", eglGetError());
-    return nullptr;
-  }
-
-  const EGLint offScreenSurfaceAttribs[] = {EGL_WIDTH, width, EGL_HEIGHT,
-                                            height, EGL_NONE};
-  EGLSurface eglSurface =
-      eglCreatePbufferSurface(eglDisplay, eglConfig, offScreenSurfaceAttribs);
-  if (!eglMakeCurrent(eglDisplay, eglSurface, eglSurface, eglContext)) {
-    RNSkLogger::logToConsole("eglMakeCurrent failed: %d\n", eglGetError());
-    return nullptr;
-  }
-  GLint buffer;
-  glGetIntegerv(GL_FRAMEBUFFER_BINDING, &buffer);
-
-  GLint stencil;
-  glGetIntegerv(GL_STENCIL_BITS, &stencil);
-
-  GLint samples;
-  glGetIntegerv(GL_SAMPLES, &samples);
-
-  // Create the Skia backend context
-  auto backendInterface = GrGLMakeNativeInterface();
-  auto grContext = GrDirectContext::MakeGL(backendInterface);
-  if (grContext == nullptr) {
-    RNSkLogger::logToConsole("GrDirectContext::MakeGL failed");
-    return nullptr;
-  }
-  auto maxSamples =
-      grContext->maxSurfaceSampleCountForColorType(kRGBA_8888_SkColorType);
-
-  if (samples > maxSamples)
-    samples = maxSamples;
-
-  GrGLFramebufferInfo fbInfo;
-  fbInfo.fFBOID = buffer;
-  fbInfo.fFormat = 0x8058;
-
-  auto renderTarget =
-      GrBackendRenderTarget(width, height, samples, stencil, fbInfo);
-
-  struct OffscreenRenderContext {
-    EGLDisplay display;
-    EGLSurface surface;
-  };
-  auto ctx = new OffscreenRenderContext({eglDisplay, eglSurface});
-
-  auto surface = SkSurfaces::WrapBackendRenderTarget(
-      grContext.get(), renderTarget, kBottomLeft_GrSurfaceOrigin,
-      kRGBA_8888_SkColorType, nullptr, nullptr,
-      [](void *addr) {
-        auto ctx = reinterpret_cast<OffscreenRenderContext *>(addr);
-        eglDestroySurface(ctx->display, ctx->surface);
-        delete ctx;
-      },
-      reinterpret_cast<void *>(ctx));
-  return surface;
-}
-
-std::shared_ptr<OpenGLDrawingContext>
-SkiaOpenGLRenderer::getThreadDrawingContext() {
-  auto threadId = std::this_thread::get_id();
-  if (threadContexts.count(threadId) == 0) {
-    auto drawingContext = std::make_shared<OpenGLDrawingContext>();
-    drawingContext->glContext = EGL_NO_CONTEXT;
-    drawingContext->glDisplay = EGL_NO_DISPLAY;
-    drawingContext->glConfig = 0;
-    drawingContext->skContext = nullptr;
-    threadContexts.emplace(threadId, drawingContext);
-  }
-  return threadContexts.at(threadId);
-}
-
-SkiaOpenGLRenderer::SkiaOpenGLRenderer(jobject surface) {
-  _nativeWindow =
-      ANativeWindow_fromSurface(facebook::jni::Environment::current(), surface);
-}
-
-SkiaOpenGLRenderer::~SkiaOpenGLRenderer() {
-  // Release surface
-  ANativeWindow_release(_nativeWindow);
-  _nativeWindow = nullptr;
-}
-
-bool SkiaOpenGLRenderer::run(const std::function<void(SkCanvas *)> &cb,
-                             int width, int height) {
-  switch (_renderState) {
-  case RenderState::Initializing: {
-    _renderState = RenderState::Rendering;
-    // Just let the case drop to drawing - we have initialized
-    // and we should be able to render (if the picture is set)
-  }
-  case RenderState::Rendering: {
-    // Make sure to initialize the rendering pipeline
-    if (!ensureInitialised()) {
-      return false;
-    }
-
-    if (cb != nullptr) {
-      // RNSkLogger::logToConsole("SKIARENDER - Render begin");
-
-      getThreadDrawingContext()->skContext->resetContext();
-
-      SkColorType colorType;
-      // setup surface for fbo0
-      GrGLFramebufferInfo fboInfo;
-      fboInfo.fFBOID = 0;
-      fboInfo.fFormat = 0x8058;
-      colorType = kN32_SkColorType;
-
-      GrBackendRenderTarget backendRT(width, height, 0, STENCIL_BUFFER_SIZE,
-                                      fboInfo);
-
-      SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
-
-      sk_sp<SkSurface> renderTarget(SkSurfaces::WrapBackendRenderTarget(
-          getThreadDrawingContext()->skContext.get(), backendRT,
-          kBottomLeft_GrSurfaceOrigin, colorType, nullptr, &props));
-
-      auto canvas = renderTarget->getCanvas();
-
-      // Draw picture into surface
-      cb(canvas);
-
-      // Flush
-      canvas->flush();
-
-      if (!eglSwapBuffers(getThreadDrawingContext()->glDisplay, _glSurface)) {
-        RNSkLogger::logToConsole("eglSwapBuffers failed: %d\n", eglGetError());
-        return false;
-      }
-
-      // RNSkLogger::logToConsole("SKIARENDER - render done");
-      return true;
-    }
-
-    return false;
-  }
-  case RenderState::Finishing: {
-    _renderState = RenderState::Done;
-
-    // Release GL surface
-    if (_glSurface != EGL_NO_SURFACE &&
-        getThreadDrawingContext()->glDisplay != EGL_NO_DISPLAY) {
-      eglDestroySurface(getThreadDrawingContext()->glDisplay, _glSurface);
-      _glSurface = EGL_NO_SURFACE;
-    }
-
-    return true;
-  }
-  case RenderState::Done: {
-    // Do nothing. We're done.
-    return true;
-  }
-  }
-}
-
-bool SkiaOpenGLRenderer::ensureInitialised() {
-  // Set up static OpenGL context
-  if (!initStaticGLContext()) {
-    return false;
-  }
-
-  // Set up OpenGL Surface
-  if (!initGLSurface()) {
-    return false;
-  }
-
-  // Init skia static context
-  if (!initStaticSkiaContext()) {
-    return false;
-  }
-
-  return true;
-}
-
-void SkiaOpenGLRenderer::teardown() { _renderState = RenderState::Finishing; }
-
-bool SkiaOpenGLRenderer::initStaticGLContext() {
-  if (getThreadDrawingContext()->glContext != EGL_NO_CONTEXT) {
-    return true;
-  }
-
-  getThreadDrawingContext()->glDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-  if (getThreadDrawingContext()->glDisplay == EGL_NO_DISPLAY) {
-    RNSkLogger::logToConsole("eglGetdisplay failed : %i", glGetError());
-    return false;
-  }
-
-  EGLint major;
-  EGLint minor;
-  if (!eglInitialize(getThreadDrawingContext()->glDisplay, &major, &minor)) {
-    RNSkLogger::logToConsole("eglInitialize failed : %i", glGetError());
-    return false;
-  }
-
-  EGLint att[] = {EGL_RENDERABLE_TYPE,
-                  EGL_OPENGL_ES2_BIT,
-                  EGL_SURFACE_TYPE,
-                  EGL_WINDOW_BIT,
-                  EGL_ALPHA_SIZE,
-                  8,
-                  EGL_BLUE_SIZE,
-                  8,
-                  EGL_GREEN_SIZE,
-                  8,
-                  EGL_RED_SIZE,
-                  8,
-                  EGL_DEPTH_SIZE,
-                  0,
-                  EGL_STENCIL_SIZE,
-                  0,
-                  EGL_NONE};
-
-  EGLint numConfigs;
-  getThreadDrawingContext()->glConfig = 0;
-  if (!eglChooseConfig(getThreadDrawingContext()->glDisplay, att,
-                       &getThreadDrawingContext()->glConfig, 1, &numConfigs) ||
-      numConfigs == 0) {
-    RNSkLogger::logToConsole("Failed to choose a config %d\n", eglGetError());
-    return false;
-  }
-
-  EGLint contextAttribs[] = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE};
-
-  getThreadDrawingContext()->glContext = eglCreateContext(
-      getThreadDrawingContext()->glDisplay, getThreadDrawingContext()->glConfig,
-      NULL, contextAttribs);
-
-  if (getThreadDrawingContext()->glContext == EGL_NO_CONTEXT) {
-    RNSkLogger::logToConsole("eglCreateContext failed: %d\n", eglGetError());
-    return false;
-  }
-
-  return true;
-}
-
-bool SkiaOpenGLRenderer::initStaticSkiaContext() {
-  if (getThreadDrawingContext()->skContext != nullptr) {
-    return true;
-  }
-
-  // Create the Skia backend context
-  auto backendInterface = GrGLMakeNativeInterface();
-  getThreadDrawingContext()->skContext =
-      GrDirectContext::MakeGL(backendInterface);
-  if (getThreadDrawingContext()->skContext == nullptr) {
-    RNSkLogger::logToConsole("GrDirectContext::MakeGL failed");
-    return false;
-  }
-
-  return true;
-}
-
-bool SkiaOpenGLRenderer::initGLSurface() {
-  if (_nativeWindow == nullptr) {
-    return false;
-  }
-
-  if (_glSurface != EGL_NO_SURFACE) {
-    if (!eglMakeCurrent(getThreadDrawingContext()->glDisplay, _glSurface,
-                        _glSurface, getThreadDrawingContext()->glContext)) {
-      RNSkLogger::logToConsole("eglMakeCurrent failed: %d\n", eglGetError());
-      return false;
-    }
-    return true;
-  }
-
-  // Create the opengl surface
-  _glSurface = eglCreateWindowSurface(getThreadDrawingContext()->glDisplay,
-                                      getThreadDrawingContext()->glConfig,
-                                      _nativeWindow, nullptr);
-
-  if (_glSurface == EGL_NO_SURFACE) {
-    RNSkLogger::logToConsole("eglCreateWindowSurface failed: %d\n",
-                             eglGetError());
-    return false;
-  }
-
-  if (!eglMakeCurrent(getThreadDrawingContext()->glDisplay, _glSurface,
-                      _glSurface, getThreadDrawingContext()->glContext)) {
-    RNSkLogger::logToConsole("eglMakeCurrent failed: %d\n", eglGetError());
-    return false;
-  }
-
-  return true;
-}
-} // namespace RNSkia

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

@@ -1,124 +0,0 @@
-#pragma once
-
-#include <RNSkLog.h>
-
-#include "EGL/egl.h"
-#include "GLES2/gl2.h"
-#include "android/native_window.h"
-#include <fbjni/fbjni.h>
-#include <jni.h>
-
-#include <condition_variable>
-#include <memory>
-#include <thread>
-#include <unordered_map>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "SkCanvas.h"
-#include "SkColorSpace.h"
-#include "SkPicture.h"
-#include "SkSurface.h"
-
-#include "include/gpu/GrBackendSurface.h"
-#include "include/gpu/GrDirectContext.h"
-#include "include/gpu/ganesh/SkSurfaceGanesh.h"
-#include "include/gpu/gl/GrGLInterface.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-sk_sp<SkSurface> MakeOffscreenGLSurface(int width, int height);
-
-using OpenGLDrawingContext = struct {
-  EGLContext glContext;
-  EGLDisplay glDisplay;
-  EGLConfig glConfig;
-  sk_sp<GrDirectContext> skContext;
-};
-
-static std::unordered_map<std::thread::id,
-                          std::shared_ptr<OpenGLDrawingContext>>
-    threadContexts;
-
-enum RenderState : int {
-  Initializing,
-  Rendering,
-  Finishing,
-  Done,
-};
-
-class SkiaOpenGLRenderer {
-public:
-  explicit SkiaOpenGLRenderer(jobject surface);
-  ~SkiaOpenGLRenderer();
-
-  /**
-   * Initializes, renders and tears down the render pipeline depending on the
-   * state of the renderer. All OpenGL/Skia context operations are done on a
-   * separate thread which must be the same for all calls to the render method.
-   *
-   * @param callback Render callback
-   * @param width Width of surface to render if there is a picture
-   * @param height Height of surface to render if there is a picture
-   */
-  bool run(const std::function<void(SkCanvas *)> &cb, int width, int height);
-
-  /**
-   * Sets the state to finishing. Next time the renderer will be called it
-   * will tear down and release its resources. It is important that this
-   * is done on the same thread as the other OpenGL context stuff is handled.
-   *
-   * Teardown can be called fom whatever thread we want - but we must ensure
-   * that at least one call to render on the render thread is done after calling
-   * teardown.
-   */
-  void teardown();
-
-private:
-  /**
-   * Initializes all required OpenGL and Skia objects
-   * @return True if initialization went well.
-   */
-  bool ensureInitialised();
-
-  /**
-   * Initializes the static OpenGL context that is shared between
-   * all instances of the renderer.
-   * @return True if initialization went well
-   */
-  bool initStaticGLContext();
-
-  /**
-   * Initializes the static Skia context that is shared between
-   * all instances of the renderer
-   * @return True if initialization went well
-   */
-  bool initStaticSkiaContext();
-
-  /**
-   * Inititalizes the OpenGL surface from the native view pointer we
-   * got on initialization. Each renderer has its own OpenGL surface to
-   * render on.
-   * @return True if initialization went well
-   */
-  bool initGLSurface();
-
-  /**
-   * To be able to use static contexts (and avoid reloading the skia context for
-   * each new view, we track the OpenGL and Skia drawing context per thread.
-   * @return The drawing context for the current thread
-   */
-  static std::shared_ptr<OpenGLDrawingContext> getThreadDrawingContext();
-
-  EGLSurface _glSurface = EGL_NO_SURFACE;
-
-  ANativeWindow *_nativeWindow = nullptr;
-
-  int _prevWidth = 0;
-  int _prevHeight = 0;
-
-  std::atomic<RenderState> _renderState = {RenderState::Initializing};
-};
-} // namespace RNSkia

package/ios/RNSkia-iOS/SkiaMetalRenderer.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include "SkSurface.h"
-
-sk_sp<SkSurface> MakeOffscreenMetalSurface(int width, int height);

package/ios/RNSkia-iOS/SkiaMetalRenderer.mm

@@ -1,55 +0,0 @@
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#import "SkCanvas.h"
-#import "SkColorSpace.h"
-#import "SkSurface.h"
-
-#import <include/gpu/GrBackendSurface.h>
-#import <include/gpu/GrDirectContext.h>
-#import <include/gpu/ganesh/SkSurfaceGanesh.h>
-
-#pragma clang diagnostic pop
-
-#import <MetalKit/MetalKit.h>
-
-struct OffscreenRenderContext {
-  id<MTLDevice> device;
-  id<MTLCommandQueue> commandQueue;
-  sk_sp<GrDirectContext> skiaContext;
-  id<MTLTexture> texture;
-
-  OffscreenRenderContext(int width, int height) {
-    device = MTLCreateSystemDefaultDevice();
-    commandQueue =
-        id<MTLCommandQueue>(CFRetain((GrMTLHandle)[device newCommandQueue]));
-    skiaContext = GrDirectContext::MakeMetal((__bridge void *)device,
-                                             (__bridge void *)commandQueue);
-    // Create a Metal texture descriptor
-    MTLTextureDescriptor *textureDescriptor = [MTLTextureDescriptor
-        texture2DDescriptorWithPixelFormat:MTLPixelFormatBGRA8Unorm
-                                     width:width
-                                    height:height
-                                 mipmapped:NO];
-    textureDescriptor.usage =
-        MTLTextureUsageRenderTarget | MTLTextureUsageShaderRead;
-    texture = [device newTextureWithDescriptor:textureDescriptor];
-  }
-};
-
-sk_sp<SkSurface> MakeOffscreenMetalSurface(int width, int height) {
-  auto ctx = new OffscreenRenderContext(width, height);
-
-  // Create a GrBackendTexture from the Metal texture
-  GrMtlTextureInfo info;
-  info.fTexture.retain((__bridge void *)ctx->texture);
-  GrBackendTexture backendTexture(width, height, GrMipMapped::kNo, info);
-
-  // Create a SkSurface from the GrBackendTexture
-  auto surface = SkSurfaces::WrapBackendTexture(
-      ctx->skiaContext.get(), backendTexture, kTopLeft_GrSurfaceOrigin, 0,
-      kBGRA_8888_SkColorType, nullptr, nullptr,
-      [](void *addr) { delete (OffscreenRenderContext *)addr; }, ctx);
-
-  return surface;
-}