@shopify/react-native-skia 2.5.2 → 2.5.4

package/cpp/rnskia/RNDawnContext.h

@@ -297,11 +297,11 @@ public:
     // 1. Create Surface
     wgpu::SurfaceDescriptor surfaceDescriptor;
 #ifdef __APPLE__
-    wgpu::SurfaceDescriptorFromMetalLayer metalSurfaceDesc;
+    wgpu::SurfaceSourceMetalLayer metalSurfaceDesc;
     metalSurfaceDesc.layer = window;
     surfaceDescriptor.nextInChain = &metalSurfaceDesc;
 #else
-    wgpu::SurfaceDescriptorFromAndroidNativeWindow androidSurfaceDesc;
+    wgpu::SurfaceSourceAndroidNativeWindow androidSurfaceDesc;
     androidSurfaceDesc.window = window;
     surfaceDescriptor.nextInChain = &androidSurfaceDesc;
 #endif

package/cpp/rnskia/RNDawnWindowContext.h

@@ -34,6 +34,9 @@ public:
     wgpu::SurfaceTexture surfaceTexture;
     _surface.GetCurrentTexture(&surfaceTexture);
     auto texture = surfaceTexture.texture;
+    if (!texture) {
+      return nullptr;
+    }
     skgpu::graphite::DawnTextureInfo info(
         /*sampleCount=*/1, skgpu::Mipmapped::kNo,
         DawnUtils::PreferredTextureFormat, texture.GetUsage(),

package/cpp/rnskia/RNSkManager.cpp

@@ -14,6 +14,8 @@
 #ifdef SK_GRAPHITE
 #include "RNDawnContext.h"
 #include "rnwgpu/api/GPU.h"
+#include "rnwgpu/api/GPUUncapturedErrorEvent.h"
+#include "rnwgpu/api/RNWebGPU.h"
 #include "rnwgpu/api/descriptors/GPUBufferUsage.h"
 #include "rnwgpu/api/descriptors/GPUColorWrite.h"
 #include "rnwgpu/api/descriptors/GPUMapMode.h"
@@ -73,8 +75,9 @@ void RNSkManager::installBindings() {
       jsi::Object::createFromHostObject(*_jsRuntime, _viewApi));
 
 #ifdef SK_GRAPHITE
-  // Install WebGPU GPU constructor
+  // Install WebGPU constructors
   rnwgpu::GPU::installConstructor(*_jsRuntime);
+  rnwgpu::GPUUncapturedErrorEvent::installConstructor(*_jsRuntime);
   // Create and expose navigator.gpu using DawnContext's instance
   auto &dawnContext = DawnContext::getInstance();
   auto gpu =
@@ -103,9 +106,13 @@ void RNSkManager::installBindings() {
                                    rnwgpu::GPUMapMode::create(*_jsRuntime));
   _jsRuntime->global().setProperty(*_jsRuntime, "GPUShaderStage",
                                    rnwgpu::GPUShaderStage::create(*_jsRuntime));
-  _jsRuntime->global().setProperty(
-      *_jsRuntime, "GPUTextureUsage",
-      rnwgpu::GPUTextureUsage::create(*_jsRuntime));
+  _jsRuntime->global().setProperty(*_jsRuntime, "GPUTextureUsage",
+                                   rnwgpu::GPUTextureUsage::create(*_jsRuntime));
+
+  // Install RNWebGPU global object for WebGPU Canvas support
+  auto rnWebGPU = std::make_shared<rnwgpu::RNWebGPU>(gpu, nullptr);
+  _jsRuntime->global().setProperty(*_jsRuntime, "RNWebGPU",
+                                   rnwgpu::RNWebGPU::create(*_jsRuntime, rnWebGPU));
 #endif
 }
 } // namespace RNSkia

package/cpp/rnwgpu/Canvas.h

@@ -0,0 +1,50 @@
+#pragma once
+
+#include <memory>
+
+#include "jsi2/NativeObject.h"
+
+namespace rnwgpu {
+
+namespace jsi = facebook::jsi;
+
+class Canvas : public NativeObject<Canvas> {
+public:
+  static constexpr const char *CLASS_NAME = "Canvas";
+
+  Canvas(void *nativeSurface, int width, int height)
+      : NativeObject(CLASS_NAME), _nativeSurface(nativeSurface), _width(width),
+        _height(height), _clientWidth(width), _clientHeight(height) {}
+
+  void *getNativeSurface() { return _nativeSurface; }
+
+  int getWidth() { return _width; }
+  int getHeight() { return _height; }
+
+  void setWidth(int width) { _width = width; }
+  void setHeight(int height) { _height = height; }
+
+  int getClientWidth() { return _clientWidth; }
+  int getClientHeight() { return _clientHeight; }
+
+  void setClientWidth(int width) { _clientWidth = width; }
+  void setClientHeight(int height) { _clientHeight = height; }
+
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installGetterSetter(runtime, prototype, "width", &Canvas::getWidth,
+                        &Canvas::setWidth);
+    installGetterSetter(runtime, prototype, "height", &Canvas::getHeight,
+                        &Canvas::setHeight);
+    installGetter(runtime, prototype, "clientWidth", &Canvas::getClientWidth);
+    installGetter(runtime, prototype, "clientHeight", &Canvas::getClientHeight);
+  }
+
+private:
+  void *_nativeSurface;
+  int _width;
+  int _height;
+  int _clientWidth;
+  int _clientHeight;
+};
+
+} // namespace rnwgpu

package/cpp/rnwgpu/PlatformContext.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <memory>
+
+#include "webgpu/webgpu_cpp.h"
+
+namespace rnwgpu {
+
+class PlatformContext {
+public:
+  PlatformContext() = default;
+  virtual ~PlatformContext() = default;
+
+  virtual wgpu::Surface makeSurface(wgpu::Instance instance, void *surface,
+                                    int width, int height) = 0;
+};
+
+} // namespace rnwgpu

package/cpp/rnwgpu/SurfaceRegistry.h

@@ -0,0 +1,229 @@
+#pragma once
+
+#include <memory>
+#include <shared_mutex>
+#include <unordered_map>
+#include <utility>
+
+#include "webgpu/webgpu_cpp.h"
+
+namespace rnwgpu {
+
+struct NativeInfo {
+  void *nativeSurface;
+  int width;
+  int height;
+};
+
+struct Size {
+  int width;
+  int height;
+};
+
+class SurfaceInfo {
+public:
+  SurfaceInfo(wgpu::Instance gpu, int width, int height)
+      : gpu(std::move(gpu)), width(width), height(height) {}
+
+  ~SurfaceInfo() { surface = nullptr; }
+
+  void reconfigure(int newWidth, int newHeight) {
+    std::unique_lock<std::shared_mutex> lock(_mutex);
+    config.width = newWidth;
+    config.height = newHeight;
+    _configure();
+  }
+
+  void configure(wgpu::SurfaceConfiguration &newConfig) {
+    std::unique_lock<std::shared_mutex> lock(_mutex);
+    config = newConfig;
+    config.width = width;
+    config.height = height;
+    config.presentMode = wgpu::PresentMode::Fifo;
+    _configure();
+  }
+
+  void unconfigure() {
+    std::unique_lock<std::shared_mutex> lock(_mutex);
+    if (surface) {
+      surface.Unconfigure();
+    } else {
+      texture = nullptr;
+    }
+  }
+
+  void *switchToOffscreen() {
+    std::unique_lock<std::shared_mutex> lock(_mutex);
+    // We only do this if the onscreen surface is configured.
+    auto isConfigured = config.device != nullptr;
+    if (isConfigured) {
+      wgpu::TextureDescriptor textureDesc;
+      textureDesc.usage = wgpu::TextureUsage::RenderAttachment |
+                          wgpu::TextureUsage::CopySrc |
+                          wgpu::TextureUsage::TextureBinding;
+      textureDesc.format = config.format;
+      textureDesc.size.width = config.width;
+      textureDesc.size.height = config.height;
+      texture = config.device.CreateTexture(&textureDesc);
+    }
+    surface = nullptr;
+    return nativeSurface;
+  }
+
+  void switchToOnscreen(void *newNativeSurface, wgpu::Surface newSurface) {
+    std::unique_lock<std::shared_mutex> lock(_mutex);
+    nativeSurface = newNativeSurface;
+    surface = std::move(newSurface);
+    // If we are comming from an offscreen context, we need to configure the new
+    // surface
+    if (texture != nullptr) {
+      config.usage = config.usage | wgpu::TextureUsage::CopyDst;
+      _configure();
+      // We flush the offscreen texture to the onscreen one
+      wgpu::CommandEncoderDescriptor encoderDesc;
+      auto device = config.device;
+      wgpu::CommandEncoder encoder = device.CreateCommandEncoder(&encoderDesc);
+
+      wgpu::TexelCopyTextureInfo sourceTexture = {};
+      sourceTexture.texture = texture;
+
+      wgpu::TexelCopyTextureInfo destinationTexture = {};
+      wgpu::SurfaceTexture surfaceTexture;
+      surface.GetCurrentTexture(&surfaceTexture);
+      destinationTexture.texture = surfaceTexture.texture;
+
+      wgpu::Extent3D size = {sourceTexture.texture.GetWidth(),
+                             sourceTexture.texture.GetHeight(),
+                             sourceTexture.texture.GetDepthOrArrayLayers()};
+
+      encoder.CopyTextureToTexture(&sourceTexture, &destinationTexture, &size);
+
+      wgpu::CommandBuffer commands = encoder.Finish();
+      wgpu::Queue queue = device.GetQueue();
+      queue.Submit(1, &commands);
+      surface.Present();
+      texture = nullptr;
+    }
+  }
+
+  void resize(int newWidth, int newHeight) {
+    std::unique_lock<std::shared_mutex> lock(_mutex);
+    width = newWidth;
+    height = newHeight;
+  }
+
+  void present() {
+    std::unique_lock<std::shared_mutex> lock(_mutex);
+    if (surface) {
+      surface.Present();
+    }
+  }
+
+  wgpu::Texture getCurrentTexture() {
+    std::shared_lock<std::shared_mutex> lock(_mutex);
+    if (surface) {
+      wgpu::SurfaceTexture surfaceTexture;
+      surface.GetCurrentTexture(&surfaceTexture);
+      return surfaceTexture.texture;
+    } else {
+      return texture;
+    }
+  }
+
+  NativeInfo getNativeInfo() {
+    std::shared_lock<std::shared_mutex> lock(_mutex);
+    return {.nativeSurface = nativeSurface, .width = width, .height = height};
+  }
+
+  Size getSize() {
+    std::shared_lock<std::shared_mutex> lock(_mutex);
+    return {.width = width, .height = height};
+  }
+
+  wgpu::SurfaceConfiguration getConfig() {
+    std::shared_lock<std::shared_mutex> lock(_mutex);
+    return config;
+  }
+
+  wgpu::Device getDevice() {
+    std::shared_lock<std::shared_mutex> lock(_mutex);
+    return config.device;
+  }
+
+private:
+  void _configure() {
+    if (surface) {
+      surface.Configure(&config);
+    } else {
+      wgpu::TextureDescriptor textureDesc;
+      textureDesc.format = config.format;
+      textureDesc.size.width = config.width;
+      textureDesc.size.height = config.height;
+      textureDesc.usage = wgpu::TextureUsage::RenderAttachment |
+                          wgpu::TextureUsage::CopySrc |
+                          wgpu::TextureUsage::TextureBinding;
+      texture = config.device.CreateTexture(&textureDesc);
+    }
+  }
+
+  mutable std::shared_mutex _mutex;
+  void *nativeSurface = nullptr;
+  wgpu::Surface surface = nullptr;
+  wgpu::Texture texture = nullptr;
+  wgpu::Instance gpu;
+  wgpu::SurfaceConfiguration config;
+  int width;
+  int height;
+};
+
+class SurfaceRegistry {
+public:
+  static SurfaceRegistry &getInstance() {
+    static SurfaceRegistry instance;
+    return instance;
+  }
+
+  SurfaceRegistry(const SurfaceRegistry &) = delete;
+  SurfaceRegistry &operator=(const SurfaceRegistry &) = delete;
+
+  std::shared_ptr<SurfaceInfo> getSurfaceInfo(int id) {
+    std::shared_lock<std::shared_mutex> lock(_mutex);
+    auto it = _registry.find(id);
+    if (it != _registry.end()) {
+      return it->second;
+    }
+    return nullptr;
+  }
+
+  void removeSurfaceInfo(int id) {
+    std::unique_lock<std::shared_mutex> lock(_mutex);
+    _registry.erase(id);
+  }
+
+  std::shared_ptr<SurfaceInfo> addSurfaceInfo(int id, wgpu::Instance gpu,
+                                              int width, int height) {
+    std::unique_lock<std::shared_mutex> lock(_mutex);
+    auto info = std::make_shared<SurfaceInfo>(gpu, width, height);
+    _registry[id] = info;
+    return info;
+  }
+
+  std::shared_ptr<SurfaceInfo>
+  getSurfaceInfoOrCreate(int id, wgpu::Instance gpu, int width, int height) {
+    std::unique_lock<std::shared_mutex> lock(_mutex);
+    auto it = _registry.find(id);
+    if (it != _registry.end()) {
+      return it->second;
+    }
+    auto info = std::make_shared<SurfaceInfo>(gpu, width, height);
+    _registry[id] = info;
+    return info;
+  }
+
+private:
+  SurfaceRegistry() = default;
+  mutable std::shared_mutex _mutex;
+  std::unordered_map<int, std::shared_ptr<SurfaceInfo>> _registry;
+};
+
+} // namespace rnwgpu

package/cpp/rnwgpu/api/GPU.cpp

@@ -88,6 +88,18 @@ std::unordered_set<std::string> GPU::getWgslLanguageFeatures() {
     case wgpu::WGSLLanguageFeatureName::PointerCompositeAccess:
       name = "pointer_composite_access";
       break;
+    case wgpu::WGSLLanguageFeatureName::UniformBufferStandardLayout:
+      name = "uniform_buffer_standard_layout";
+      break;
+    case wgpu::WGSLLanguageFeatureName::SubgroupId:
+      name = "subgroup_id";
+      break;
+    case wgpu::WGSLLanguageFeatureName::FragmentDepth:
+      name = "fragment_depth";
+      break;
+    case wgpu::WGSLLanguageFeatureName::ImmediateAddressSpace:
+      name = "immediate_address_space";
+      break;
     case wgpu::WGSLLanguageFeatureName::ChromiumTestingUnimplemented:
       name = "chromium_testing_unimplemented";
       break;

package/cpp/rnwgpu/api/GPUAdapter.cpp

@@ -10,6 +10,9 @@
 #include "Convertors.h"
 
 #include "GPUFeatures.h"
+#include "GPUInternalError.h"
+#include "GPUOutOfMemoryError.h"
+#include "GPUValidationError.h"
 #include "jsi2/JSIConverter.h"
 
 namespace rnwgpu {
@@ -73,6 +76,29 @@ async::AsyncTaskHandle GPUAdapter::requestDevice(
                                  std::string(message.data, message.length)
                            : "no message";
     fprintf(stderr, "%s", fullMessage.c_str());
+
+    // Look up the GPUDevice from the registry and notify it
+    auto *gpuDevice = GPUDeviceRegistry::getInstance().getDevice(device.Get());
+    if (gpuDevice != nullptr) {
+      std::string messageStr =
+          message.length > 0 ? std::string(message.data, message.length) : "";
+
+      GPUErrorVariant error;
+      switch (type) {
+      case wgpu::ErrorType::Validation:
+        error = std::make_shared<GPUValidationError>(messageStr);
+        break;
+      case wgpu::ErrorType::OutOfMemory:
+        error = std::make_shared<GPUOutOfMemoryError>(messageStr);
+        break;
+      case wgpu::ErrorType::Internal:
+      case wgpu::ErrorType::Unknown:
+      default:
+        error = std::make_shared<GPUInternalError>(messageStr);
+        break;
+      }
+      gpuDevice->notifyUncapturedError(std::move(error));
+    }
   });
   std::string label =
       descriptor.has_value() ? descriptor.value()->label.value_or("") : "";

package/cpp/rnwgpu/api/GPUCanvasContext.cpp

@@ -0,0 +1,64 @@
+#include "GPUCanvasContext.h"
+#include "Convertors.h"
+#include <memory>
+
+#ifdef __APPLE__
+namespace dawn::native::metal {
+
+void WaitForCommandsToBeScheduled(WGPUDevice device);
+
+}
+#endif
+
+namespace rnwgpu {
+
+void GPUCanvasContext::configure(
+    std::shared_ptr<GPUCanvasConfiguration> configuration) {
+  Convertor conv;
+  wgpu::SurfaceConfiguration surfaceConfiguration;
+  surfaceConfiguration.device = configuration->device->get();
+  if (configuration->viewFormats.has_value()) {
+    if (!conv(surfaceConfiguration.viewFormats,
+              surfaceConfiguration.viewFormatCount,
+              configuration->viewFormats.value())) {
+      throw std::runtime_error("Error with SurfaceConfiguration");
+    }
+  }
+  if (!conv(surfaceConfiguration.usage, configuration->usage) ||
+      !conv(surfaceConfiguration.format, configuration->format)) {
+    throw std::runtime_error("Error with SurfaceConfiguration");
+  }
+
+#ifdef __APPLE__
+  surfaceConfiguration.alphaMode = configuration->alphaMode;
+#endif
+  surfaceConfiguration.presentMode = wgpu::PresentMode::Fifo;
+  _surfaceInfo->configure(surfaceConfiguration);
+}
+
+void GPUCanvasContext::unconfigure() {}
+
+std::shared_ptr<GPUTexture> GPUCanvasContext::getCurrentTexture() {
+  auto prevSize = _surfaceInfo->getConfig();
+  auto width = _canvas->getWidth();
+  auto height = _canvas->getHeight();
+  auto sizeHasChanged = prevSize.width != width || prevSize.height != height;
+  if (sizeHasChanged) {
+    _surfaceInfo->reconfigure(width, height);
+  }
+  auto texture = _surfaceInfo->getCurrentTexture();
+  return std::make_shared<GPUTexture>(texture, "");
+}
+
+void GPUCanvasContext::present() {
+#ifdef __APPLE__
+  dawn::native::metal::WaitForCommandsToBeScheduled(
+      _surfaceInfo->getDevice().Get());
+#endif
+  auto size = _surfaceInfo->getSize();
+  _canvas->setClientWidth(size.width);
+  _canvas->setClientHeight(size.height);
+  _surfaceInfo->present();
+}
+
+} // namespace rnwgpu

package/cpp/rnwgpu/api/GPUCanvasContext.h

@@ -0,0 +1,65 @@
+#pragma once
+
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "descriptors/Unions.h"
+
+#include "webgpu/webgpu_cpp.h"
+
+#include "jsi2/NativeObject.h"
+
+#include "rnwgpu/Canvas.h"
+#include "GPU.h"
+#include "descriptors/GPUCanvasConfiguration.h"
+#include "GPUTexture.h"
+#include "rnwgpu/SurfaceRegistry.h"
+
+namespace rnwgpu {
+
+namespace jsi = facebook::jsi;
+
+class GPUCanvasContext : public NativeObject<GPUCanvasContext> {
+public:
+  static constexpr const char *CLASS_NAME = "GPUCanvasContext";
+
+  GPUCanvasContext(std::shared_ptr<GPU> gpu, int contextId, int width,
+                   int height)
+      : NativeObject(CLASS_NAME), _gpu(std::move(gpu)) {
+    _canvas = std::make_shared<Canvas>(nullptr, width, height);
+    auto &registry = rnwgpu::SurfaceRegistry::getInstance();
+    _surfaceInfo =
+        registry.getSurfaceInfoOrCreate(contextId, _gpu->get(), width, height);
+  }
+
+public:
+  std::string getBrand() { return CLASS_NAME; }
+
+  std::shared_ptr<Canvas> getCanvas() { return _canvas; }
+
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installGetter(runtime, prototype, "__brand", &GPUCanvasContext::getBrand);
+    installGetter(runtime, prototype, "canvas", &GPUCanvasContext::getCanvas);
+    installMethod(runtime, prototype, "configure",
+                  &GPUCanvasContext::configure);
+    installMethod(runtime, prototype, "unconfigure",
+                  &GPUCanvasContext::unconfigure);
+    installMethod(runtime, prototype, "getCurrentTexture",
+                  &GPUCanvasContext::getCurrentTexture);
+    installMethod(runtime, prototype, "present", &GPUCanvasContext::present);
+  }
+
+  inline const wgpu::Surface get() { return nullptr; }
+  void configure(std::shared_ptr<GPUCanvasConfiguration> configuration);
+  void unconfigure();
+  std::shared_ptr<GPUTexture> getCurrentTexture();
+  void present();
+
+private:
+  std::shared_ptr<Canvas> _canvas;
+  std::shared_ptr<SurfaceInfo> _surfaceInfo;
+  std::shared_ptr<GPU> _gpu;
+};
+
+} // namespace rnwgpu

package/cpp/rnwgpu/api/GPUDevice.cpp

@@ -431,4 +431,56 @@ async::AsyncTaskHandle GPUDevice::getLost() {
   _lostHandle = handle;
   return handle;
 }
+void GPUDevice::addEventListener(std::string type, jsi::Function callback) {
+  std::lock_guard<std::mutex> lock(_listenersMutex);
+  auto sharedCallback = std::make_shared<jsi::Function>(std::move(callback));
+  _eventListeners[type].push_back(sharedCallback);
+}
+
+void GPUDevice::removeEventListener(std::string type, jsi::Function callback) {
+  std::lock_guard<std::mutex> lock(_listenersMutex);
+  auto it = _eventListeners.find(type);
+  if (it != _eventListeners.end()) {
+    auto &listeners = it->second;
+    // Remove the last listener of this type (simple approach since we can't
+    // easily compare jsi::Function objects)
+    if (!listeners.empty()) {
+      listeners.pop_back();
+    }
+  }
+}
+
+void GPUDevice::notifyUncapturedError(GPUErrorVariant error) {
+  auto runtime = getCreationRuntime();
+  if (runtime == nullptr) {
+    return;
+  }
+
+  std::vector<std::shared_ptr<jsi::Function>> listeners;
+  {
+    std::lock_guard<std::mutex> lock(_listenersMutex);
+    auto it = _eventListeners.find("uncapturederror");
+    if (it != _eventListeners.end()) {
+      listeners = it->second;
+    }
+  }
+
+  if (listeners.empty()) {
+    return;
+  }
+
+  // Create the event object
+  auto event = std::make_shared<GPUUncapturedErrorEvent>(std::move(error));
+  auto eventValue = GPUUncapturedErrorEvent::create(*runtime, event);
+
+  // Call all listeners
+  for (const auto &listener : listeners) {
+    try {
+      listener->call(*runtime, eventValue);
+    } catch (const std::exception &e) {
+      fprintf(stderr, "Error in uncapturederror listener: %s\n", e.what());
+    }
+  }
+}
+
 } // namespace rnwgpu