react-native-skia 3.0.1 → 3.0.3

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

@@ -1,67 +0,0 @@
-#include "OpenGLWindowContext.h"
-#include "GrAHardwareBufferUtils.h"
-
-#include "OpenGLContext.h"
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/gpu/ganesh/SkImageGanesh.h"
-#include "include/gpu/ganesh/gl/GrGLBackendSurface.h"
-#include "src/gpu/ganesh/gl/GrGLDefines.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-sk_sp<SkSurface> OpenGLWindowContext::getSurface() {
-  if (_skSurface == nullptr) {
-    if (_glSurface == nullptr || !_glContext->makeCurrent(_glSurface.get())) {
-      RNSkLogger::logToConsole(
-          "Couldn't create the EGL window surface, the surface will not be "
-          "rendered");
-      return nullptr;
-    }
-    GLint stencil;
-    glGetIntegerv(GL_STENCIL_BITS, &stencil);
-
-    GLint samples;
-    glGetIntegerv(GL_SAMPLES, &samples);
-
-    auto colorType = kRGBA_8888_SkColorType;
-
-    auto maxSamples =
-        _directContext->maxSurfaceSampleCountForColorType(colorType);
-
-    if (samples > maxSamples) {
-      samples = maxSamples;
-    }
-
-    GrGLFramebufferInfo fbInfo;
-    fbInfo.fFBOID = 0;
-    fbInfo.fFormat = GR_GL_RGBA8;
-    // fbInfo.fProtected =
-    // skgpu::Protected(fDisplayParams.fCreateProtectedNativeBackend);
-
-    auto width = ANativeWindow_getWidth(_window);
-    auto height = ANativeWindow_getHeight(_window);
-    auto backendRT =
-        GrBackendRenderTargets::MakeGL(width, height, samples, stencil, fbInfo);
-    sk_sp<SkColorSpace> colorSpace(nullptr);
-    SkSurfaceProps surfaceProps(0, kRGB_H_SkPixelGeometry);
-    _skSurface = SkSurfaces::WrapBackendRenderTarget(
-        _directContext, backendRT, kBottomLeft_GrSurfaceOrigin,
-        kRGBA_8888_SkColorType, colorSpace, &surfaceProps);
-  }
-  return _skSurface;
-}
-
-void OpenGLWindowContext::present() {
-  if (_glSurface == nullptr || !_glContext->makeCurrent(_glSurface.get())) {
-    return;
-  }
-  _directContext->flushAndSubmit();
-  _glSurface->present();
-}
-
-} // namespace RNSkia

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

@@ -1,75 +0,0 @@
-#pragma once
-
-#include "RNSkLog.h"
-
-#include <fbjni/fbjni.h>
-#include <jni.h>
-
-#include <android/native_window_jni.h>
-#include <android/surface_texture.h>
-#include <android/surface_texture_jni.h>
-#include <condition_variable>
-#include <memory>
-#include <thread>
-#include <unordered_map>
-
-#include "RNWindowContext.h"
-#include "gl/Display.h"
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkCanvas.h"
-#include "include/core/SkColorSpace.h"
-#include "include/core/SkSurface.h"
-#include "include/gpu/ganesh/GrBackendSurface.h"
-#include "include/gpu/ganesh/GrDirectContext.h"
-#include "include/gpu/ganesh/SkSurfaceGanesh.h"
-#include "include/gpu/ganesh/gl/GrGLInterface.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-class OpenGLWindowContext : public WindowContext {
-public:
-  OpenGLWindowContext(GrDirectContext *directContext, gl::Display *display,
-                      gl::Context *glContext, ANativeWindow *window,
-                      EGLConfig config)
-      : _directContext(directContext), _glContext(glContext), _window(window) {
-    ANativeWindow_acquire(_window);
-    _glSurface = display->makeWindowSurface(config, _window);
-  }
-
-  ~OpenGLWindowContext() override {
-    _skSurface = nullptr;
-    _glSurface = nullptr;
-    ANativeWindow_release(_window);
-  }
-
-  sk_sp<SkSurface> getSurface() override;
-
-  void present() override;
-
-  int getWidth() override { return ANativeWindow_getWidth(_window); };
-
-  int getHeight() override { return ANativeWindow_getHeight(_window); };
-
-  void resize(int width, int height) override {
-    if (_skSurface != nullptr) {
-      // Let's make sure there is no pending work
-      _glContext->makeCurrent(_glSurface.get());
-      _glSurface->present();
-      _skSurface = nullptr;
-    }
-  }
-
-private:
-  GrDirectContext *_directContext;
-  gl::Context *_glContext = nullptr;
-  ANativeWindow *_window;
-  sk_sp<SkSurface> _skSurface = nullptr;
-  std::unique_ptr<gl::Surface> _glSurface = nullptr;
-};
-
-} // namespace RNSkia

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

@@ -1,67 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "RNSkOpenGLCanvasProvider.h"
-#include <android/native_window.h>
-
-namespace RNSkia {
-
-class RNSkBaseAndroidView {
-public:
-  virtual void surfaceAvailable(jobject surface, int width, int height,
-                                bool isSurface, bool highBitDepth) = 0;
-
-  virtual void surfaceDestroyed() = 0;
-
-  virtual void surfaceSizeChanged(jobject surface, int width, int height,
-                                  bool isSurface, bool highBitDepth) = 0;
-
-  virtual float getPixelDensity() = 0;
-
-  virtual void setShowDebugInfo(bool show) = 0;
-
-  virtual std::shared_ptr<RNSkView> getSkiaView() = 0;
-};
-
-template <typename T>
-class RNSkAndroidView : public T, public RNSkBaseAndroidView {
-public:
-  explicit RNSkAndroidView(std::shared_ptr<RNSkia::RNSkPlatformContext> context)
-      : T(context,
-          std::make_shared<RNSkOpenGLCanvasProvider>(
-              std::bind(&RNSkia::RNSkView::requestRedraw, this), context)) {}
-
-  void surfaceAvailable(jobject surface, int width, int height, bool isSurface,
-                        bool highBitDepth) override {
-    std::static_pointer_cast<RNSkOpenGLCanvasProvider>(T::getCanvasProvider())
-        ->surfaceAvailable(surface, width, height, isSurface, highBitDepth);
-    RNSkView::redraw();
-  }
-
-  void surfaceDestroyed() override {
-    std::static_pointer_cast<RNSkOpenGLCanvasProvider>(T::getCanvasProvider())
-        ->surfaceDestroyed();
-  }
-
-  void surfaceSizeChanged(jobject surface, int width, int height,
-                          bool isSurface, bool highBitDepth) override {
-    std::static_pointer_cast<RNSkOpenGLCanvasProvider>(T::getCanvasProvider())
-        ->surfaceSizeChanged(surface, width, height, isSurface, highBitDepth);
-    // Paint the new size right away rather than on the next scheduled redraw.
-    RNSkView::redraw();
-  }
-
-  float getPixelDensity() override {
-    return T::getPlatformContext()->getPixelDensity();
-  }
-
-  void setShowDebugInfo(bool show) override { T::setShowDebugOverlays(show); }
-
-  std::shared_ptr<RNSkView> getSkiaView() override {
-    return T::shared_from_this();
-  }
-};
-} // namespace RNSkia

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

@@ -1,80 +0,0 @@
-#pragma once
-
-#include "gl/Error.h"
-#include "gl/Surface.h"
-
-namespace gl {
-
-class Surface;
-class Display;
-
-class Context {
-public:
-  ~Context() {
-    if (_context != EGL_NO_CONTEXT) {
-      if (eglDestroyContext(_display, _context) != EGL_TRUE) {
-        LOG_EGL_ERROR;
-      }
-    }
-  }
-
-  bool isValid() const { return _context != EGL_NO_CONTEXT; }
-
-  const EGLContext &getHandle() const { return _context; }
-
-  bool makeCurrent(const Surface *surface) {
-    if (_context == EGL_NO_CONTEXT) {
-      return false;
-    }
-    if (surface == nullptr || !surface->isValid()) {
-      return false;
-    }
-    const auto result =
-        eglMakeCurrentIfNecessary(_display, surface->getHandle(),
-                                  surface->getHandle(), _context) == EGL_TRUE;
-    if (!result) {
-      LOG_EGL_ERROR;
-    }
-    return result;
-  }
-
-  bool clearCurrent() {
-    const auto result =
-        eglMakeCurrentIfNecessary(_display, EGL_NO_SURFACE, EGL_NO_SURFACE,
-                                  EGL_NO_CONTEXT) == EGL_TRUE;
-    if (!result) {
-      LOG_EGL_ERROR;
-    }
-    return result;
-  }
-
-  bool isCurrent() const { return eglGetCurrentContext() == _context; }
-
-private:
-  friend class Display;
-
-  EGLDisplay _display = EGL_NO_DISPLAY;
-  EGLContext _context = EGL_NO_CONTEXT;
-
-  static EGLBoolean eglMakeCurrentIfNecessary(EGLDisplay display,
-                                              EGLSurface draw, EGLSurface read,
-                                              EGLContext context) {
-    if (display != eglGetCurrentDisplay() ||
-        draw != eglGetCurrentSurface(EGL_DRAW) ||
-        read != eglGetCurrentSurface(EGL_READ) ||
-        context != eglGetCurrentContext()) {
-      return eglMakeCurrent(display, draw, read, context);
-    }
-
-    return EGL_TRUE;
-  }
-
-  Context(EGLDisplay display, EGLContext context)
-      : _display(display), _context(context) {}
-
-  Context(const Context &) = delete;
-
-  Context &operator=(const Context &) = delete;
-};
-
-} // namespace gl

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

@@ -1,123 +0,0 @@
-#pragma once
-
-#include <memory>
-
-#include "EGL/egl.h"
-#include "GLES2/gl2.h"
-
-#include "gl/Context.h"
-#include "gl/Error.h"
-
-namespace gl {
-
-class Context;
-class Surface;
-
-class Display {
-public:
-  Display() {
-    EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-
-    if (eglInitialize(display, nullptr, nullptr) != EGL_TRUE) {
-      LOG_EGL_ERROR;
-      return;
-    }
-    _display = display;
-  }
-
-  ~Display() {
-    if (_display != EGL_NO_DISPLAY) {
-      if (eglTerminate(_display) != EGL_TRUE) {
-        LOG_EGL_ERROR;
-      }
-    }
-  }
-
-  bool isValid() const { return _display != EGL_NO_DISPLAY; }
-
-  void clearContext() {
-    eglMakeCurrent(_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-  }
-
-  EGLConfig chooseConfig() {
-
-    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,
-                    8,
-                    EGL_GREEN_SIZE,
-                    8,
-                    EGL_RED_SIZE,
-                    8,
-                    EGL_DEPTH_SIZE,
-                    0,
-                    EGL_STENCIL_SIZE,
-                    0,
-                    EGL_SAMPLE_BUFFERS,
-                    0,
-                    EGL_NONE};
-
-    EGLint numConfigs;
-    EGLConfig glConfig = 0;
-    if (eglChooseConfig(_display, att, &glConfig, 1, &numConfigs) != EGL_TRUE ||
-        numConfigs == 0) {
-      LOG_EGL_ERROR;
-      return 0;
-    }
-
-    return glConfig;
-  }
-
-  std::unique_ptr<Context> makeContext(const EGLConfig &config,
-                                       const Context *share_context) {
-    EGLint contextAttribs[] = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE};
-    auto context = eglCreateContext(
-        _display, config,
-        share_context != nullptr ? share_context->getHandle() : nullptr,
-        contextAttribs);
-
-    if (context == EGL_NO_CONTEXT) {
-      LOG_EGL_ERROR;
-      return nullptr;
-    }
-    return std::unique_ptr<Context>(new Context(_display, context));
-  }
-
-  std::unique_ptr<Surface> makeWindowSurface(const EGLConfig &config,
-                                             ANativeWindow *window) {
-    const EGLint attribs[] = {EGL_NONE};
-    auto surface = eglCreateWindowSurface(_display, config, window, attribs);
-    if (surface == EGL_NO_SURFACE) {
-      LOG_EGL_ERROR;
-      return nullptr;
-    }
-    return std::make_unique<Surface>(_display, surface);
-  }
-
-  std::unique_ptr<Surface> makePixelBufferSurface(const EGLConfig &config,
-                                                  size_t width, size_t height) {
-    const EGLint attribs[] = {EGL_WIDTH, static_cast<EGLint>(width), EGL_HEIGHT,
-                              static_cast<EGLint>(height), EGL_NONE};
-    auto surface = eglCreatePbufferSurface(_display, config, attribs);
-    if (surface == EGL_NO_SURFACE) {
-      LOG_EGL_ERROR;
-      return nullptr;
-    }
-    return std::make_unique<Surface>(_display, surface);
-  }
-
-  const EGLDisplay &getHandle() const { return _display; }
-
-private:
-  EGLDisplay _display = EGL_NO_DISPLAY;
-
-  Display(const Display &) = delete;
-
-  Display &operator=(const Display &) = delete;
-};
-
-} // namespace gl

package/android/cpp/rnskia-android/gl/Error.cpp

@@ -1,45 +0,0 @@
-#include "gl/Error.h"
-
-#include "RNSkLog.h"
-
-static const char *EGLErrorToString(EGLint error) {
-  switch (error) {
-  case EGL_SUCCESS:
-    return "Success";
-  case EGL_NOT_INITIALIZED:
-    return "Not Initialized";
-  case EGL_BAD_ACCESS:
-    return "Bad Access";
-  case EGL_BAD_ALLOC:
-    return "Bad Alloc";
-  case EGL_BAD_ATTRIBUTE:
-    return "Bad Attribute";
-  case EGL_BAD_CONTEXT:
-    return "Bad Context";
-  case EGL_BAD_CONFIG:
-    return "Bad Config";
-  case EGL_BAD_CURRENT_SURFACE:
-    return "Bad Current Surface";
-  case EGL_BAD_DISPLAY:
-    return "Bad Display";
-  case EGL_BAD_SURFACE:
-    return "Bad Surface";
-  case EGL_BAD_MATCH:
-    return "Bad Match";
-  case EGL_BAD_PARAMETER:
-    return "Bad Parameter";
-  case EGL_BAD_NATIVE_PIXMAP:
-    return "Bad Native Pixmap";
-  case EGL_BAD_NATIVE_WINDOW:
-    return "Bad Native Window";
-  case EGL_CONTEXT_LOST:
-    return "Context Lost";
-  }
-  return "Unknown";
-}
-
-void LogEGLError(const char *file, int line) {
-  const auto error = eglGetError();
-  RNSkia::RNSkLogger::logToConsole("EGL Error: %s (%d) in %s:%d",
-                                   EGLErrorToString(error), error, file, line);
-}

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

@@ -1,8 +0,0 @@
-#pragma once
-
-#include "EGL/egl.h"
-#include "GLES2/gl2.h"
-
-#define LOG_EGL_ERROR LogEGLError(__FILE__, __LINE__);
-
-void LogEGLError(const char *file, int line);

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

@@ -1,43 +0,0 @@
-#pragma once
-
-#include "gl/Error.h"
-
-namespace gl {
-
-class Surface {
-public:
-  Surface(EGLDisplay display, EGLSurface surface)
-      : _display(display), _surface(surface) {}
-
-  ~Surface() {
-    if (_surface != EGL_NO_SURFACE) {
-      if (eglDestroySurface(_display, _surface) != EGL_TRUE) {
-        LOG_EGL_ERROR;
-      }
-    }
-  }
-
-  bool isValid() const { return _surface != EGL_NO_SURFACE; }
-
-  const EGLSurface &getHandle() const { return _surface; }
-
-  bool present() {
-    const auto result = eglSwapBuffers(_display, _surface) == EGL_TRUE;
-    if (!result) {
-      LOG_EGL_ERROR;
-    }
-    return result;
-  }
-
-private:
-  friend class Display;
-
-  EGLDisplay _display = EGL_NO_DISPLAY;
-  EGLSurface _surface = EGL_NO_SURFACE;
-
-  Surface(const Surface &) = delete;
-
-  Surface &operator=(const Surface &) = delete;
-};
-
-} // namespace gl

package/android/src/main/java/com/reactnative/skia/SkiaBaseViewManager.java

@@ -1,65 +0,0 @@
-package com.reactnative.skia;
-
-import com.facebook.react.uimanager.PointerEvents;
-import com.facebook.react.uimanager.ViewProps;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.views.view.ReactViewGroup;
-import com.facebook.react.views.view.ReactViewManager;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-public abstract class SkiaBaseViewManager<T extends SkiaBaseView> extends ReactViewManager {
-
-    @Override
-    public void setNativeId(@NonNull ReactViewGroup view, @Nullable String nativeId) {
-        super.setNativeId(view, nativeId);
-        int nativeIdResolved = Integer.parseInt(nativeId);
-        ((SkiaBaseView)view).registerView(nativeIdResolved);
-    }
-
-    @ReactProp(name = "debug")
-    public void setDebug(T view, boolean show) {
-        ((SkiaBaseView)view).setDebugMode(show);
-    }
-
-    @ReactProp(name = "opaque")
-    public void setOpaque(T view, boolean value) {
-        ((SkiaBaseView)view).setOpaque(value);
-    }
-
-    @ReactProp(name = "highBitDepth")
-    public void setHighBitDepth(T view, boolean value) {
-        ((SkiaBaseView)view).setHighBitDepth(value);
-    }
-
-    @ReactProp(name = "androidSurfaceType")
-    public void setAndroidSurfaceType(T view, @Nullable String value) {
-        ((SkiaBaseView)view).setSurfaceType(value);
-    }
-
-    @ReactProp(name = "androidZOrderOnTop")
-    public void setAndroidZOrderOnTop(T view, boolean value) {
-        ((SkiaBaseView)view).setZOrderOnTop(value);
-    }
-
-    // The backing view depends on several props (opaque, androidSurfaceType,
-    // androidZOrderOnTop, highBitDepth), so it is resolved once per transaction
-    // rather than in each setter.
-    @Override
-    protected void onAfterUpdateTransaction(@NonNull ReactViewGroup view) {
-        super.onAfterUpdateTransaction(view);
-        ((SkiaBaseView)view).updateView();
-    }
-
-    @ReactProp(name = ViewProps.POINTER_EVENTS)
-    public void setPointerEvents(T view, @Nullable String pointerEventsStr) {
-        view.setPointerEvents(PointerEvents.parsePointerEvents(pointerEventsStr));
-    }
-
-    @Override
-    public void onDropViewInstance(@NonNull ReactViewGroup view) {
-        super.onDropViewInstance(view);
-        ((SkiaBaseView)view).dropInstance();
-    }
-}

package/android/src/main/java/com/reactnative/skia/SkiaGraphiteView.java

@@ -1,78 +0,0 @@
-package com.reactnative.skia;
-
-import android.content.Context;
-import android.view.Choreographer;
-
-import com.facebook.jni.HybridData;
-import com.facebook.jni.annotations.DoNotStrip;
-import com.facebook.react.bridge.ReactContext;
-
-/**
- * Presents Graphite recordings: JS records frames through the context
- * returned by SkiaViewApi.makeGraphiteContext, the view replays them on the
- * Choreographer. Requires the Graphite backend.
- */
-public class SkiaGraphiteView extends SkiaBaseView implements Choreographer.FrameCallback {
-    @DoNotStrip
-    private HybridData mHybridData;
-
-    private boolean mFramePending = false;
-
-    public SkiaGraphiteView(Context context) {
-        super(context);
-        RNSkiaModule skiaModule = ((ReactContext) context).getNativeModule(RNSkiaModule.class);
-        mHybridData = initHybrid(skiaModule.getSkiaManager());
-    }
-
-    /**
-     * Presents the queued recordings on the next vsync. Main thread; called
-     * from native when a recording is submitted.
-     */
-    @DoNotStrip
-    public void scheduleFrame() {
-        if (!mFramePending) {
-            mFramePending = true;
-            Choreographer.getInstance().postFrameCallback(this);
-        }
-    }
-
-    @Override
-    public void doFrame(long frameTimeNanos) {
-        mFramePending = false;
-        if (presentFrame()) {
-            scheduleFrame();
-        }
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        Choreographer.getInstance().removeFrameCallback(this);
-        mFramePending = false;
-    }
-
-    @Override
-    protected void finalize() throws Throwable {
-        super.finalize();
-        mHybridData.resetNative();
-    }
-
-    private native HybridData initHybrid(SkiaManager skiaManager);
-
-    protected native void surfaceAvailable(Object surface, int width, int height, boolean isSurface, boolean highBitDepth);
-
-    protected native void surfaceSizeChanged(Object surface, int width, int height, boolean isSurface, boolean highBitDepth);
-
-    protected native void surfaceDestroyed();
-
-    protected native void setDebugMode(boolean show);
-
-    protected native void registerView(int nativeId);
-
-    protected native void unregisterView();
-
-    protected native int[] getBitmap(int width, int height);
-
-    /** Choreographer tick: returns whether more recordings are waiting. */
-    private native boolean presentFrame();
-}

package/android/src/main/java/com/reactnative/skia/SkiaGraphiteViewManager.java

@@ -1,32 +0,0 @@
-package com.reactnative.skia;
-
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.viewmanagers.SkiaGraphiteViewManagerDelegate;
-import com.facebook.react.viewmanagers.SkiaGraphiteViewManagerInterface;
-
-import androidx.annotation.NonNull;
-
-public class SkiaGraphiteViewManager extends SkiaBaseViewManager<SkiaGraphiteView> implements SkiaGraphiteViewManagerInterface<SkiaGraphiteView> {
-
-    protected SkiaGraphiteViewManagerDelegate mDelegate;
-
-    SkiaGraphiteViewManager() {
-        mDelegate = new SkiaGraphiteViewManagerDelegate(this);
-    }
-
-    protected SkiaGraphiteViewManagerDelegate getDelegate() {
-        return mDelegate;
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "SkiaGraphiteView";
-    }
-
-    @NonNull
-    @Override
-    public SkiaGraphiteView createViewInstance(@NonNull ThemedReactContext reactContext) {
-        return new SkiaGraphiteView(reactContext);
-    }
-}