chore(🪨): Update graphite build (#3160)

Author: wcandillon

README.md

@@ -155,12 +155,8 @@ Again, since `eval`, `draw`, and `drawOffscreen` serialize the function's conten
 ## Graphite
 
 Skia has two backends: Ganesh and Graphite. Ganesh is the default backend.
-Currently, Graphite doesn't match Ganesh in terms of features, but we offer experimental support for it.  
-If you want to tinker with Graphite, you can enable it by building Skia using `SK_GRAPHITE=1 yarn build-skia`.  
-With this command, the Skia binary will work for both Ganesh and Graphite.  
-The reason we do not currently ship this build by default is that it requires Android API Level 26 or above.
-
-To enable Graphite in your app, follow these steps:  
-* **iOS**: Install pods using `SK_GRAPHITE=1 pod install`.  
-* **Android**: In [CMakeLists.txt](/packages/skia/android/CMakeLists.txt), use `set(SK_GRAPHITE ON)`.
+If you want to experiment with Graphite, you can enable it by building Skia with `SK_GRAPHITE=1 yarn build-skia`.  
+Skia Graphite requires Android API Level 26 or above.
+
+React Native Skia automatically detects if the Dawn WebGPU implementation library files are available. If they are present, it will automatically assume that Graphite is enabled.
 

apps/example/app.json

@@ -30,5 +30,14 @@
       "dist/assets",
       "dist/main.windows.bundle"
     ]
+  },
+  "ios": {
+    "metalAPIValidation": false
+  },
+  "macos": {
+    "metalAPIValidation": false
+  },
+  "visionos": {
+    "metalAPIValidation": false
   }
 }

apps/example/ios/Podfile.lock

@@ -2193,7 +2193,7 @@ SPEC CHECKSUMS:
   React-Mapbuffer: 3c11cee7737609275c7b66bd0b1de475f094cedf
   React-microtasksnativemodule: 843f352b32aacbe13a9c750190d34df44c3e6c2c
   react-native-safe-area-context: 0f14bce545abcdfbff79ce2e3c78c109f0be283e
-  react-native-skia: 8ea98bfb08c756d04fa37803fcc4ff049d47ab42
+  react-native-skia: cde44b3bdb773204750a79d01ee74b85480287b1
   react-native-slider: bb7eb4732940fab78217e1c096bb647d8b0d1cf3
   React-NativeModulesApple: 88433b6946778bea9c153e27b671de15411bf225
   React-perflogger: 9e8d3c0dc0194eb932162812a168aa5dc662f418

packages/skia/android/CMakeLists.txt

@@ -3,7 +3,19 @@ cmake_minimum_required(VERSION 3.4.1)
 
 set (CMAKE_VERBOSE_MAKEFILE ON)
 set (CMAKE_CXX_STANDARD 17)
-set(SK_GRAPHITE OFF)
+
+# Import prebuilt SKIA libraries path first to check for Dawn libraries
+set (SKIA_LIBS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../libs/android/${ANDROID_ABI}")
+
+# Check if Dawn libraries exist, if so enable SK_GRAPHITE
+if(EXISTS "${SKIA_LIBS_PATH}/libdawn_native_static.a")
+    set(SK_GRAPHITE ON)
+    message("-- SK_GRAPHITE: ON (Dawn libraries found)")
+else()
+    set(SK_GRAPHITE OFF)
+    message("-- SK_GRAPHITE: OFF (Dawn libraries not found)")
+endif()
+
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSK_BUILD_FOR_ANDROID -DSK_IMAGE_READ_PIXELS_DISABLE_LEGACY_API -DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DON_ANDROID -DONANDROID")
 set (PACKAGE_NAME "rnskia")
 set (SKIA_LIB "skia")
@@ -31,9 +43,6 @@ message("-- LIBRN   : " ${LIBRN_DIR})
 
 link_directories(../libs/android/${ANDROID_ABI}/)
 
-# Import prebuilt SKIA libraries
-set (SKIA_LIBS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../libs/android/${ANDROID_ABI}")
-
 if(SK_GRAPHITE)
     add_definitions(-DSK_GRAPHITE)
     set(DAWN_NATIVE_LIB "libdawn_native_static")

packages/skia/android/cpp/rnskia-android/RNSkAndroidPlatformContext.h

@@ -75,6 +75,7 @@ class RNSkAndroidPlatformContext : public RNSkPlatformContext {
 #endif
   }
 
+#if !defined(SK_GRAPHITE)
   sk_sp<SkImage> makeImageFromNativeTexture(const TextureInfo &texInfo,
                                             int width, int height,
                                             bool mipMapped) override {
@@ -99,6 +100,7 @@ class RNSkAndroidPlatformContext : public RNSkPlatformContext {
         kTopLeft_GrSurfaceOrigin, kRGBA_8888_SkColorType, kUnpremul_SkAlphaType,
         nullptr);
   }
+#endif
 
   std::shared_ptr<RNSkVideo> createVideo(const std::string &url) override {
     auto jniVideo = _jniPlatformContext->createVideo(url);
@@ -171,6 +173,11 @@ class RNSkAndroidPlatformContext : public RNSkPlatformContext {
 #endif
   }
 
+#if !defined(SK_GRAPHITE)
+  GrDirectContext *getDirectContext() override {
+    return OpenGLContext::getInstance().getDirectContext();
+  }
+
   const TextureInfo getTexture(sk_sp<SkImage> image) override {
     GrBackendTexture texture;
     if (!SkImages::GetBackendTextureFromImage(image, &texture, true)) {
@@ -186,6 +193,7 @@ class RNSkAndroidPlatformContext : public RNSkPlatformContext {
   }
 
   static TextureInfo getTextureInfo(const GrBackendTexture &texture) {
+
     if (!texture.isValid()) {
       throw std::runtime_error("invalid backend texture");
     }
@@ -204,11 +212,6 @@ class RNSkAndroidPlatformContext : public RNSkPlatformContext {
     texInfo.glTarget = textureInfo.fTarget;
     return texInfo;
   }
-
-#if !defined(SK_GRAPHITE)
-  GrDirectContext *getDirectContext() override {
-    return OpenGLContext::getInstance().getDirectContext();
-  }
 #endif
 
   sk_sp<SkFontMgr> createFontMgr() override {

packages/skia/apple/RNSkApplePlatformContext.h

@@ -43,15 +43,19 @@ class RNSkApplePlatformContext : public RNSkPlatformContext {
 
   sk_sp<SkImage> makeImageFromNativeBuffer(void *buffer) override;
 
+#if !defined(SK_GRAPHITE)
+  GrDirectContext *getDirectContext() override;
+
   sk_sp<SkImage> makeImageFromNativeTexture(const TextureInfo &textureInfo,
                                             int width, int height,
                                             bool mipMapped) override;
 
-  uint64_t makeNativeBuffer(sk_sp<SkImage> image) override;
-
   const TextureInfo getTexture(sk_sp<SkSurface> image) override;
 
   const TextureInfo getTexture(sk_sp<SkImage> image) override;
+#endif
+
+  uint64_t makeNativeBuffer(sk_sp<SkImage> image) override;
 
   void releaseNativeBuffer(uint64_t pointer) override;
 
@@ -66,9 +70,7 @@ class RNSkApplePlatformContext : public RNSkPlatformContext {
 
   void raiseError(const std::exception &err) override;
   sk_sp<SkSurface> makeOffscreenSurface(int width, int height) override;
-#if !defined(SK_GRAPHITE)
-  GrDirectContext *getDirectContext() override;
-#endif
+
   sk_sp<SkFontMgr> createFontMgr() override;
 
 private:

packages/skia/apple/RNSkApplePlatformContext.mm

@@ -156,9 +156,14 @@
   return reinterpret_cast<uint64_t>(pixelBuffer);
 }
 
+#if !defined(SK_GRAPHITE)
+GrDirectContext *RNSkApplePlatformContext::getDirectContext() {
+  return MetalContext::getInstance().getDirectContext();
+}
+
 const TextureInfo RNSkApplePlatformContext::getTexture(sk_sp<SkImage> image) {
-  GrBackendTexture texture;
   TextureInfo result;
+  GrBackendTexture texture;
   if (!SkImages::GetBackendTextureFromImage(image, &texture, true)) {
     throw std::runtime_error("Couldn't get backend texture");
   }
@@ -175,20 +180,43 @@
 
 const TextureInfo
 RNSkApplePlatformContext::getTexture(sk_sp<SkSurface> surface) {
+  TextureInfo result;
   GrBackendTexture texture = SkSurfaces::GetBackendTexture(
       surface.get(), SkSurfaces::BackendHandleAccess::kFlushRead);
-  TextureInfo result;
   if (!texture.isValid()) {
     throw std::runtime_error("Invalid backend texture");
   }
   GrMtlTextureInfo textureInfo;
   if (!GrBackendTextures::GetMtlTextureInfo(texture, &textureInfo)) {
     throw std::runtime_error("Couldn't get Metal texture info");
   }
-  result.mtlTexture = textureInfo.fTexture.get();
+  result.mtlTexture = textureInfo.fTexture.get(); 
   return result;
 }
 
+sk_sp<SkImage> RNSkApplePlatformContext::makeImageFromNativeTexture(
+    const TextureInfo &texInfo, int width, int height, bool mipMapped) {
+  id<MTLTexture> mtlTexture = (__bridge id<MTLTexture>)(texInfo.mtlTexture);
+
+  SkColorType colorType = mtlPixelFormatToSkColorType(mtlTexture.pixelFormat);
+  if (colorType == SkColorType::kUnknown_SkColorType) {
+    throw std::runtime_error("Unsupported pixelFormat");
+  }
+
+  GrMtlTextureInfo textureInfo;
+  textureInfo.fTexture.retain((__bridge const void *)mtlTexture);
+
+  GrBackendTexture texture = GrBackendTextures::MakeMtl(
+      width, height, mipMapped ? skgpu::Mipmapped::kYes : skgpu::Mipmapped::kNo,
+      textureInfo);
+
+  return SkImages::BorrowTextureFrom(getDirectContext(), texture,
+                                     kTopLeft_GrSurfaceOrigin, colorType,
+                                     kPremul_SkAlphaType, nullptr);
+  return nullptr;
+}
+#endif
+
 std::shared_ptr<RNSkVideo>
 RNSkApplePlatformContext::createVideo(const std::string &url) {
   return std::make_shared<RNSkAppleVideo>(url, this);
@@ -227,27 +255,6 @@
 #endif
 }
 
-sk_sp<SkImage> RNSkApplePlatformContext::makeImageFromNativeTexture(
-    const TextureInfo &texInfo, int width, int height, bool mipMapped) {
-  id<MTLTexture> mtlTexture = (__bridge id<MTLTexture>)(texInfo.mtlTexture);
-
-  SkColorType colorType = mtlPixelFormatToSkColorType(mtlTexture.pixelFormat);
-  if (colorType == SkColorType::kUnknown_SkColorType) {
-    throw std::runtime_error("Unsupported pixelFormat");
-  }
-
-  GrMtlTextureInfo textureInfo;
-  textureInfo.fTexture.retain((__bridge const void *)mtlTexture);
-
-  GrBackendTexture texture = GrBackendTextures::MakeMtl(
-      width, height, mipMapped ? skgpu::Mipmapped::kYes : skgpu::Mipmapped::kNo,
-      textureInfo);
-
-  return SkImages::BorrowTextureFrom(getDirectContext(), texture,
-                                     kTopLeft_GrSurfaceOrigin, colorType,
-                                     kPremul_SkAlphaType, nullptr);
-}
-
 SkColorType RNSkApplePlatformContext::mtlPixelFormatToSkColorType(
     MTLPixelFormat pixelFormat) {
   switch (pixelFormat) {
@@ -280,12 +287,6 @@
   }
 }
 
-#if !defined(SK_GRAPHITE)
-GrDirectContext *RNSkApplePlatformContext::getDirectContext() {
-  return MetalContext::getInstance().getDirectContext();
-}
-#endif
-
 sk_sp<SkFontMgr> RNSkApplePlatformContext::createFontMgr() {
   return SkFontMgr_New_CoreText(nullptr);
 }

packages/skia/apple/SkiaCVPixelBufferUtils.mm

@@ -30,16 +30,12 @@
 #include <TargetConditionals.h>
 #if TARGET_RT_BIG_ENDIAN
 #define FourCC2Str(fourcc)                                                     \
-  (const char[]) {                                                             \
-    *((char *)&fourcc), *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 2),    \
-        *(((char *)&fourcc) + 3), 0                                            \
-  }
+  (const char[]){*((char *)&fourcc), *(((char *)&fourcc) + 1),                 \
+                 *(((char *)&fourcc) + 2), *(((char *)&fourcc) + 3), 0}
 #else
 #define FourCC2Str(fourcc)                                                     \
-  (const char[]) {                                                             \
-    *(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2),                        \
-        *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0                  \
-  }
+  (const char[]){*(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2),           \
+                 *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0}
 #endif
 
 // pragma MARK: TextureHolder

packages/skia/cpp/rnskia/DawnContext.h

@@ -204,7 +204,7 @@ class DawnContext {
     DawnProcTable backendProcs = dawn::native::GetProcs();
     dawnProcSetProcs(&backendProcs);
     WGPUInstanceDescriptor desc{};
-    desc.features.timedWaitAnyEnable = true;
+    desc.capabilities.timedWaitAnyEnable = true;
     instance = std::make_unique<dawn::native::Instance>(&desc);
 
     backendContext = DawnUtils::createDawnBackendContext(instance.get());

packages/skia/cpp/rnskia/DawnUtils.h

@@ -31,7 +31,8 @@ createDawnBackendContext(dawn::native::Instance *instance) {
       "use_tint_ir",
   };
   wgpu::DawnTogglesDescriptor togglesDesc;
-  togglesDesc.enabledToggleCount = std::size(kToggles) - (useTintIR ? 0 : 1);
+  togglesDesc.enabledToggleCount =
+      (sizeof(kToggles) / sizeof(kToggles[0])) - (useTintIR ? 0 : 1);
   togglesDesc.enabledToggles = kToggles;
 
   wgpu::RequestAdapterOptions options;
@@ -100,18 +101,6 @@ createDawnBackendContext(dawn::native::Instance *instance) {
   desc.requiredFeatureCount = features.size();
   desc.requiredFeatures = features.data();
   desc.nextInChain = &togglesDesc;
-  desc.SetDeviceLostCallback(
-      wgpu::CallbackMode::AllowSpontaneous,
-      [](const wgpu::Device &, wgpu::DeviceLostReason reason,
-         const char *message) {
-        if (reason != wgpu::DeviceLostReason::Destroyed) {
-          SK_ABORT("Device lost: %s\n", message);
-        }
-      });
-  desc.SetUncapturedErrorCallback(
-      [](const wgpu::Device &, wgpu::ErrorType, const char *message) {
-        SkDebugf("Device error: %s\n", message);
-      });
 
   wgpu::Device device = adapter.CreateDevice(&desc);
   SkASSERT(device);