🔧

Author: wcandillon

packages/webgpu/apple/ApplePlatformContext.h

@@ -13,9 +13,6 @@ class ApplePlatformContext : public PlatformContext {
   wgpu::Surface makeSurface(wgpu::Instance instance, void *surface, int width,
                             int height) override;
 
-  void configureSurfaceColor(void *nativeSurface,
-                             const SurfaceColorConfig &config) override;
-
   ImageData createImageBitmap(std::string blobId, double offset,
                               double size) override;
 

packages/webgpu/apple/ApplePlatformContext.mm

@@ -2,7 +2,6 @@
 
 #include <TargetConditionals.h>
 
-#import <QuartzCore/CAMetalLayer.h>
 #import <React/RCTBlobManager.h>
 #import <React/RCTBridge+Private.h>
 #import <ReactCommon/RCTTurboModule.h>
@@ -40,70 +39,6 @@ void checkIfUsingSimulatorWithAPIValidation() {
   return instance.CreateSurface(&surfaceDescriptor);
 }
 
-void ApplePlatformContext::configureSurfaceColor(
-    void *nativeSurface, const SurfaceColorConfig &config) {
-  if (!nativeSurface) {
-    NSLog(@"[RNWebGPU] configureSurfaceColor: nativeSurface is null");
-    return;
-  }
-  CAMetalLayer *layer = (__bridge CAMetalLayer *)nativeSurface;
-
-  // CAMetalLayer property setters are documented as thread-safe, and we need
-  // these changes to land before the caller renders / presents the next
-  // frame, so apply synchronously here instead of bouncing to the main queue.
-  [CATransaction begin];
-  [CATransaction setDisableActions:YES];
-
-  CGColorSpaceRef colorSpace = nullptr;
-  if (config.extendedDynamicRange) {
-#if !TARGET_OS_OSX
-    if (@available(iOS 16.0, *)) {
-      layer.wantsExtendedDynamicRangeContent = YES;
-    }
-#else
-    layer.wantsExtendedDynamicRangeContent = YES;
-#endif
-    // Extended linear sRGB allows shader values >1 to map into the display's
-    // EDR headroom on supporting hardware.
-    colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceExtendedLinearSRGB);
-  } else {
-#if !TARGET_OS_OSX
-    if (@available(iOS 16.0, *)) {
-      layer.wantsExtendedDynamicRangeContent = NO;
-    }
-#else
-    layer.wantsExtendedDynamicRangeContent = NO;
-#endif
-    // Non-extended sRGB clamps float values >1 to SDR. Linear variants
-    // ("kCGColorSpaceLinearSRGB") still pass values >1 through on iOS, so we
-    // use gamma-encoded sRGB for the standard tone-mapping mode.
-    colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
-  }
-  if (colorSpace) {
-    layer.colorspace = colorSpace;
-    CGColorSpaceRelease(colorSpace);
-  }
-
-  [CATransaction commit];
-
-#if !TARGET_OS_OSX
-  CGFloat headroom = 1.0;
-  if (@available(iOS 16.0, *)) {
-    headroom = UIScreen.mainScreen.currentEDRHeadroom;
-  }
-  NSLog(@"[RNWebGPU] HDR configure: extended=%d format=%u "
-        @"layer.wantsEDR=%d layer.colorspace=%@ EDRHeadroom=%.2f",
-        (int)config.extendedDynamicRange, (unsigned)config.format,
-        (int)layer.wantsExtendedDynamicRangeContent, layer.colorspace,
-        (double)headroom);
-#else
-  NSLog(@"[RNWebGPU] HDR configure: extended=%d format=%u "
-        @"layer.wantsEDR=%d layer.colorspace=%@",
-        (int)config.extendedDynamicRange, (unsigned)config.format,
-        (int)layer.wantsExtendedDynamicRangeContent, layer.colorspace);
-#endif
-}
-
 static std::span<const uint8_t> nsDataToSpan(NSData *data) {
   return {static_cast<const uint8_t *>(data.bytes), data.length};
 }

packages/webgpu/apple/MetalView.mm

@@ -28,17 +28,10 @@ - (void)configure {
   auto gpu = manager->_gpu;
   auto surface = manager->_platformContext->makeSurface(
       gpu, nativeSurface, size.width, size.height);
-  auto info = registry.getSurfaceInfoOrCreate([_contextId intValue], gpu,
-                                              size.width, size.height);
-  info->switchToOnscreen(nativeSurface, surface);
-  // If a previous configure() call from JS already requested an HDR / color
-  // config for this surface, replay it onto the freshly attached layer. This
-  // covers the race where JS calls context.configure() before this MetalView
-  // mounts (e.g., on a key-driven Canvas remount).
-  if (auto colorConfig = info->getColorConfig()) {
-    manager->_platformContext->configureSurfaceColor(nativeSurface,
-                                                     *colorConfig);
-  }
+  registry
+      .getSurfaceInfoOrCreate([_contextId intValue], gpu, size.width,
+                              size.height)
+      ->switchToOnscreen(nativeSurface, surface);
 }
 
 - (void)update {

packages/webgpu/cpp/rnwgpu/PlatformContext.h

@@ -17,24 +17,13 @@ struct ImageData {
   wgpu::TextureFormat format;
 };
 
-struct SurfaceColorConfig {
-  wgpu::TextureFormat format = wgpu::TextureFormat::Undefined;
-  bool extendedDynamicRange = false;
-};
-
 class PlatformContext {
 public:
   PlatformContext() = default;
   virtual ~PlatformContext() = default;
 
   virtual wgpu::Surface makeSurface(wgpu::Instance instance, void *surface,
                                     int width, int height) = 0;
-
-  // Apply extra platform-specific color configuration on the native surface
-  // (e.g. CAMetalLayer wantsExtendedDynamicRangeContent / colorspace on
-  // Apple). Default is a no-op for platforms without HDR support.
-  virtual void configureSurfaceColor(void * /*nativeSurface*/,
-                                     const SurfaceColorConfig & /*config*/) {}
   virtual ImageData createImageBitmap(std::string blobId, double offset,
                                       double size) = 0;
 

packages/webgpu/cpp/rnwgpu/SurfaceRegistry.h

@@ -6,7 +6,6 @@
 #include <unordered_map>
 #include <utility>
 
-#include "PlatformContext.h"
 #include "webgpu/webgpu_cpp.h"
 
 namespace rnwgpu {
@@ -42,6 +41,7 @@ class SurfaceInfo {
     config.width = width;
     config.height = height;
     config.presentMode = wgpu::PresentMode::Fifo;
+    _rebindColorChain();
     _configure();
   }
 
@@ -153,17 +153,21 @@ class SurfaceInfo {
     return config.device;
   }
 
-  void setColorConfig(const SurfaceColorConfig &cfg) {
+  void setColorManagement(std::optional<wgpu::SurfaceColorManagement> mgmt) {
     std::unique_lock<std::shared_mutex> lock(_mutex);
-    _colorConfig = cfg;
+    _colorManagement = std::move(mgmt);
+    _rebindColorChain();
+    if (surface) {
+      surface.Configure(&config);
+    }
   }
 
-  std::optional<SurfaceColorConfig> getColorConfig() {
-    std::shared_lock<std::shared_mutex> lock(_mutex);
-    return _colorConfig;
+private:
+  void _rebindColorChain() {
+    config.nextInChain =
+        _colorManagement ? &_colorManagement.value() : nullptr;
   }
 
-private:
   void _configure() {
     if (surface) {
       surface.Configure(&config);
@@ -187,7 +191,7 @@ class SurfaceInfo {
   wgpu::SurfaceConfiguration config;
   int width;
   int height;
-  std::optional<SurfaceColorConfig> _colorConfig;
+  std::optional<wgpu::SurfaceColorManagement> _colorManagement;
 };
 
 class SurfaceRegistry {

packages/webgpu/cpp/rnwgpu/api/GPUCanvasContext.cpp

@@ -36,21 +36,13 @@ void GPUCanvasContext::configure(
   surfaceConfiguration.presentMode = wgpu::PresentMode::Fifo;
   _surfaceInfo->configure(surfaceConfiguration);
 
-  if (_platformContext) {
-    SurfaceColorConfig colorConfig;
-    colorConfig.format = surfaceConfiguration.format;
-    colorConfig.extendedDynamicRange =
-        configuration->toneMappingMode == GPUCanvasToneMappingMode::Extended;
-    // Stash so a (re)attaching native layer can replay this config — see
-    // MetalView::configure on Apple. This avoids a race where configure()
-    // fires from JS before the MetalView has called switchToOnscreen.
-    _surfaceInfo->setColorConfig(colorConfig);
-    auto nativeInfo = _surfaceInfo->getNativeInfo();
-    if (nativeInfo.nativeSurface) {
-      _platformContext->configureSurfaceColor(nativeInfo.nativeSurface,
-                                              colorConfig);
-    }
-  }
+  wgpu::SurfaceColorManagement colorManagement;
+  colorManagement.colorSpace = wgpu::PredefinedColorSpace::SRGB;
+  colorManagement.toneMappingMode =
+      configuration->toneMappingMode == GPUCanvasToneMappingMode::Extended
+          ? wgpu::ToneMappingMode::Extended
+          : wgpu::ToneMappingMode::Standard;
+  _surfaceInfo->setColorManagement(colorManagement);
 }
 
 void GPUCanvasContext::unconfigure() {}

packages/webgpu/cpp/rnwgpu/api/GPUCanvasContext.h

@@ -14,7 +14,6 @@
 #include "GPU.h"
 #include "GPUCanvasConfiguration.h"
 #include "GPUTexture.h"
-#include "PlatformContext.h"
 #include "SurfaceRegistry.h"
 
 namespace rnwgpu {
@@ -25,11 +24,9 @@ class GPUCanvasContext : public NativeObject<GPUCanvasContext> {
 public:
   static constexpr const char *CLASS_NAME = "GPUCanvasContext";
 
-  GPUCanvasContext(std::shared_ptr<GPU> gpu,
-                   std::shared_ptr<PlatformContext> platformContext,
-                   int contextId, int width, int height)
-      : NativeObject(CLASS_NAME), _gpu(std::move(gpu)),
-        _platformContext(std::move(platformContext)) {
+  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 =
@@ -64,7 +61,6 @@ class GPUCanvasContext : public NativeObject<GPUCanvasContext> {
   std::shared_ptr<Canvas> _canvas;
   std::shared_ptr<SurfaceInfo> _surfaceInfo;
   std::shared_ptr<GPU> _gpu;
-  std::shared_ptr<PlatformContext> _platformContext;
 };
 
 } // namespace rnwgpu

packages/webgpu/cpp/rnwgpu/api/RNWebGPU.h

@@ -70,8 +70,8 @@ class RNWebGPU : public NativeObject<RNWebGPU> {
 
   std::shared_ptr<GPUCanvasContext>
   MakeWebGPUCanvasContext(int contextId, float width, float height) {
-    auto ctx = std::make_shared<GPUCanvasContext>(
-        _gpu, _platformContext, contextId, width, height);
+    auto ctx =
+        std::make_shared<GPUCanvasContext>(_gpu, contextId, width, height);
     return ctx;
   }