@shopify/react-native-skia 2.11.0-next.1 → 2.12.0-next.1

package/cpp/api/JsiSkConverters.h

@@ -214,7 +214,7 @@ template <typename T> struct JsiOptional : std::optional<T> {
 
 } // namespace RNSkia
 
-namespace rnwgpu {
+namespace RNJsi {
 
 /**
  * sk_sp<T> arguments (SkImage, SkShader, ...). Delegates to the wrapper
@@ -407,4 +407,4 @@ template <> struct JSIConverter<SkISize> {
   }
 };
 
-} // namespace rnwgpu
+} // namespace RNJsi

package/cpp/api/JsiSkNativeObjects.h

@@ -24,7 +24,7 @@
  * be expressed as typed signatures (heterogeneous argument dispatch, typed
  * array construction, lenient options objects, promises) — everything else
  * uses installMethod/installGetter/installChainableMethod with typed C++
- * signatures converted through rnwgpu::JSIConverter.
+ * signatures converted through RNJsi::JSIConverter.
  */
 #define JSI_HOST_FUNCTION(NAME)                                                \
   jsi::Value NAME(jsi::Runtime &runtime, const jsi::Value &thisValue,          \
@@ -36,7 +36,7 @@ namespace jsi = facebook::jsi;
 
 // Minimum memory pressure reported for any native object — aliased from the
 // NativeObject infrastructure so dispose() and create() agree on the floor.
-static constexpr size_t kMinMemoryPressure = rnwgpu::kMinMemoryPressure;
+static constexpr size_t kMinMemoryPressure = RNJsi::kMinMemoryPressure;
 
 /**
  * Creates the JS object for a wrapper instance (a class based on the
@@ -102,16 +102,16 @@ std::shared_ptr<T> getJsiObject(jsi::Runtime &runtime,
  *
  * Most methods use typed C++ signatures installed with installMethod /
  * installGetter / installChainableMethod (arguments and results converted
- * through rnwgpu::JSIConverter, see JsiSkConverters.h). Methods that cannot
+ * through RNJsi::JSIConverter, see JsiSkConverters.h). Methods that cannot
  * be typed keep the classic JSI_HOST_FUNCTION signature and are installed
  * with installHostMethod, which resolves the C++ instance from `this` via
  * native state.
  */
 template <typename Derived>
-class JsiSkNativeObject : public rnwgpu::NativeObject<Derived> {
+class JsiSkNativeObject : public RNJsi::NativeObject<Derived> {
 public:
   explicit JsiSkNativeObject(std::shared_ptr<RNSkPlatformContext> context)
-      : rnwgpu::NativeObject<Derived>(Derived::CLASS_NAME),
+      : RNJsi::NativeObject<Derived>(Derived::CLASS_NAME),
         _context(std::move(context)) {}
 
   /**
@@ -120,7 +120,7 @@ public:
    */
   static std::shared_ptr<Derived> fromThis(jsi::Runtime &runtime,
                                            const jsi::Value &thisValue) {
-    return rnwgpu::NativeObject<Derived>::fromValue(runtime, thisValue);
+    return RNJsi::NativeObject<Derived>::fromValue(runtime, thisValue);
   }
 
 protected:
@@ -222,7 +222,7 @@ protected:
   /**
    * Installs a typed mutating method that returns `this` for chaining
    * (e.g. path.moveTo(...).lineTo(...)). Arguments are converted through
-   * rnwgpu::JSIConverter like installMethod; the member function's return
+   * RNJsi::JSIConverter like installMethod; the member function's return
    * value (if any) is ignored and the JS function returns thisValue.
    */
   template <typename ReturnType, typename... Args>
@@ -270,7 +270,7 @@ private:
                               ReturnType (Derived::*method)(Args...),
                               jsi::Runtime &runtime, const jsi::Value *args,
                               std::index_sequence<Is...>, size_t count) {
-    (obj->*method)(rnwgpu::JSIConverter<std::decay_t<Args>>::fromJSI(
+    (obj->*method)(RNJsi::JSIConverter<std::decay_t<Args>>::fromJSI(
         runtime, args[Is], Is >= count)...);
   }
 
@@ -280,7 +280,7 @@ private:
       jsi::Runtime &runtime, const jsi::Value *args, std::index_sequence<Is...>,
       size_t count) {
     (obj->*method)(runtime,
-                   rnwgpu::JSIConverter<std::decay_t<Args>>::fromJSI(
+                   RNJsi::JSIConverter<std::decay_t<Args>>::fromJSI(
                        runtime, args[Is], Is >= count)...);
   }
 

package/cpp/api/JsiSkRuntimeEffect.h

@@ -39,7 +39,7 @@ struct RuntimeEffectUniform {
 
 } // namespace RNSkia
 
-namespace rnwgpu {
+namespace RNJsi {
 
 // RuntimeEffectUniform -> {columns, rows, slot, isInteger}
 template <> struct JSIConverter<RNSkia::RuntimeEffectUniform> {
@@ -54,7 +54,7 @@ template <> struct JSIConverter<RNSkia::RuntimeEffectUniform> {
   }
 };
 
-} // namespace rnwgpu
+} // namespace RNJsi
 
 namespace RNSkia {
 

package/cpp/api/recorder/Convertor.h

@@ -69,7 +69,51 @@ template <typename T> struct unwrap_optional<std::optional<T>> {
 template <typename T>
 T getPropertyValue(jsi::Runtime &runtime, const jsi::Value &value);
 
-// Base template for convertProperty
+template <typename T, typename Target>
+bool convertSelectorProperty(jsi::Runtime &runtime, const jsi::Value &prop,
+                             Target &target, Variables &variables) {
+  if (!prop.isObject()) {
+    return false;
+  }
+  auto wrapper = prop.asObject(runtime);
+  if (!wrapper.hasProperty(runtime, "__sv") ||
+      !wrapper.hasProperty(runtime, "__key")) {
+    return false;
+  }
+  auto svVal = wrapper.getProperty(runtime, "__sv");
+  auto keyVal = wrapper.getProperty(runtime, "__key");
+  if (!isSharedValue(runtime, svVal) || !keyVal.isString()) {
+    return false;
+  }
+  auto sharedValue = svVal.asObject(runtime);
+  auto key = keyVal.asString(runtime).utf8(runtime);
+  auto name =
+      sharedValue.getProperty(runtime, "name").asString(runtime).utf8(runtime);
+
+  auto conv = [target = &target, key](jsi::Runtime &runtime,
+                                      const jsi::Object &val) {
+    auto value = val.getProperty(runtime, "value");
+    if (!value.isObject()) {
+      return;
+    }
+    auto values = value.asObject(runtime);
+    if (!values.hasProperty(runtime, key.c_str())) {
+      return;
+    }
+
+    auto selected = values.getProperty(runtime, key.c_str());
+    if (selected.isUndefined() || selected.isNull() ||
+        (selected.isObject() && selected.asObject(runtime).isFunction(runtime))) {
+      return;
+    }
+    *target = getPropertyValue<T>(runtime, selected);
+  };
+
+  variables[name].push_back(conv);
+  conv(runtime, sharedValue);
+  return true;
+}
+
 template <typename T, typename Target>
 void convertPropertyImpl(jsi::Runtime &runtime, const jsi::Object &object,
                          const std::string &propertyName, Target &target,
@@ -78,13 +122,16 @@ void convertPropertyImpl(jsi::Runtime &runtime, const jsi::Object &object,
     return;
   }
 
-  auto property = object.getProperty(runtime, propertyName.c_str());
+  auto prop = object.getProperty(runtime, propertyName.c_str());
+
+  if (convertSelectorProperty<T>(runtime, prop, target, variables)) {
+    return;
+  }
 
-  if (isSharedValue(runtime, property)) {
-    auto sharedValue = property.asObject(runtime);
-    auto name = sharedValue.getProperty(runtime, "name")
-                    .asString(runtime)
-                    .utf8(runtime);
+  if (isSharedValue(runtime, prop)) {
+    auto sharedValue = prop.asObject(runtime);
+    auto name =
+        sharedValue.getProperty(runtime, "name").asString(runtime).utf8(runtime);
     auto conv = [target = &target](jsi::Runtime &runtime,
                                    const jsi::Object &val) {
       auto value = val.getProperty(runtime, "value");
@@ -92,9 +139,10 @@ void convertPropertyImpl(jsi::Runtime &runtime, const jsi::Object &object,
     };
     variables[name].push_back(conv);
     conv(runtime, sharedValue);
-  } else {
-    target = getPropertyValue<T>(runtime, property);
+    return;
   }
+
+  target = getPropertyValue<T>(runtime, prop);
 }
 
 // Main convertProperty template

package/cpp/api/third_party/SkottieUtils.cpp

@@ -10,7 +10,7 @@
 #include "include/core/SkData.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkSize.h"
-#include "include/private/base/SkAssert.h"
+#include "include/private/SkAssert.h"
 #include "modules/skottie/include/Skottie.h"
 #include "modules/skresources/include/SkResources.h"
 

package/cpp/dawn/include/dawn/dawn_proc_table.h

@@ -106,7 +106,9 @@ typedef struct DawnProcTable {
     WGPUProcDeviceCreateComputePipeline deviceCreateComputePipeline;
     WGPUProcDeviceCreateComputePipelineAsync deviceCreateComputePipelineAsync;
     WGPUProcDeviceCreateErrorBuffer deviceCreateErrorBuffer;
+    WGPUProcDeviceCreateErrorComputePipeline deviceCreateErrorComputePipeline;
     WGPUProcDeviceCreateErrorExternalTexture deviceCreateErrorExternalTexture;
+    WGPUProcDeviceCreateErrorRenderPipeline deviceCreateErrorRenderPipeline;
     WGPUProcDeviceCreateErrorShaderModule deviceCreateErrorShaderModule;
     WGPUProcDeviceCreateErrorTexture deviceCreateErrorTexture;
     WGPUProcDeviceCreateExternalTexture deviceCreateExternalTexture;
@@ -237,8 +239,8 @@ typedef struct DawnProcTable {
 
     WGPUProcResourceTableDestroy resourceTableDestroy;
     WGPUProcResourceTableGetSize resourceTableGetSize;
-    WGPUProcResourceTableInsertBinding resourceTableInsertBinding;
-    WGPUProcResourceTableRemoveBinding resourceTableRemoveBinding;
+    WGPUProcResourceTableInsert resourceTableInsert;
+    WGPUProcResourceTableRemove resourceTableRemove;
     WGPUProcResourceTableSetLabel resourceTableSetLabel;
     WGPUProcResourceTableUpdate resourceTableUpdate;
     WGPUProcResourceTableAddRef resourceTableAddRef;
@@ -313,10 +315,8 @@ typedef struct DawnProcTable {
     WGPUProcTextureGetTextureBindingViewDimension textureGetTextureBindingViewDimension;
     WGPUProcTextureGetUsage textureGetUsage;
     WGPUProcTextureGetWidth textureGetWidth;
-    WGPUProcTexturePin texturePin;
     WGPUProcTextureSetLabel textureSetLabel;
     WGPUProcTextureSetOwnershipForMemoryDump textureSetOwnershipForMemoryDump;
-    WGPUProcTextureUnpin textureUnpin;
     WGPUProcTextureAddRef textureAddRef;
     WGPUProcTextureRelease textureRelease;
 

package/cpp/dawn/include/dawn/dawn_version.h

@@ -34,7 +34,7 @@
 namespace dawn {
 
 // The version is a 20-byte SHA1 hash. If the hash is not available, it is all zeros.
-static constexpr std::array<uint8_t, 20> kDawnVersion = { 0x63, 0xf2, 0x5f, 0xee, 0xc5, 0x1e, 0x93, 0x51, 0xfb, 0x25, 0x22, 0x2b, 0x6d, 0x5d, 0xe1, 0xaf, 0x79, 0x1d, 0x7c, 0x4f };
+static constexpr std::array<uint8_t, 20> kDawnVersion = { 0x1e, 0x89, 0x72, 0x75, 0x17, 0x2a, 0x23, 0xf2, 0x7b, 0x00, 0x22, 0xfa, 0x6b, 0xea, 0xe3, 0x08, 0x4e, 0xd5, 0x4a, 0x9b };
 
 }  // namespace dawn
 

package/cpp/dawn/include/dawn/native/D3D12Backend.h

@@ -28,8 +28,25 @@
 #ifndef INCLUDE_DAWN_NATIVE_D3D12BACKEND_H_
 #define INCLUDE_DAWN_NATIVE_D3D12BACKEND_H_
 
-#include <d3d11on12.h>
+// d3d12.h must be included first, before other d3d headers that may include it, to ensure
+// we pick up the one from the Agility SDK when enabled.
+#if defined(DAWN_USE_AGILITY_SDK)
+// clang-format off
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmicrosoft-enum-value"
+#pragma clang diagnostic ignored "-Wnested-anon-types"
+#endif
+#include "third_party/agility-sdk/src/build/native/include/d3d12.h"
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+#else  // defined(DAWN_USE_AGILITY_SDK)
 #include <d3d12.h>
+#endif  // defined(DAWN_USE_AGILITY_SDK)
+// clang-format on
+
+#include <d3d11on12.h>
 #include <dxgi1_4.h>
 #include <wrl/client.h>
 

package/cpp/dawn/include/dawn/native/DawnNative.h

@@ -82,8 +82,7 @@ struct FeatureInfo {
 class DAWN_NATIVE_EXPORT Adapter {
   public:
     Adapter();
-    // NOLINTNEXTLINE(runtime/explicit)
-    Adapter(AdapterBase* impl);
+    explicit(false) Adapter(AdapterBase* impl);
     ~Adapter();
 
     Adapter(const Adapter& other);

package/cpp/dawn/include/dawn/platform/DawnPlatform.h

@@ -34,7 +34,6 @@
 #include <cstdint>
 #include <memory>
 #include <span>
-#include <string_view>
 
 #include "dawn/platform/dawn_platform_export.h"
 
@@ -54,21 +53,14 @@ class DAWN_PLATFORM_EXPORT CachingInterface {
 
     // Returns zero if there does not exist a cached entry for |key|, otherwise returns a non-zero
     // size indicating the size of cached data
-    virtual size_t FindKey(std::string_view key) { return 0; }
+    virtual size_t FindKey(std::span<const std::byte> key) = 0;
 
     // Returns zero if unable to load cached entry for |key| into |dest|, otherwise returns number
     // of bytes written to |dest|.
-    virtual size_t LoadData(std::string_view key, std::span<uint8_t> dest) { return 0; }
+    virtual size_t LoadData(std::span<const std::byte> key, std::span<std::byte> dest) = 0;
 
     // Stores the data in |src| at the entry specified by |key|.
-    virtual void StoreData(std::string_view key, std::span<const uint8_t> src) {}
-
-    // TODO(503801946): Remove these outdated default implementations and make the newer API above
-    // fully virtual once users are updated.
-    virtual size_t LoadData(const void* key, size_t keySize, void* valueOut, size_t valueSize) {
-        return 0;
-    }
-    virtual void StoreData(const void* key, size_t keySize, const void* value, size_t valueSize) {}
+    virtual void StoreData(std::span<const std::byte> key, std::span<const std::byte> src) = 0;
 
   private:
     CachingInterface(const CachingInterface&) = delete;
@@ -145,6 +137,7 @@ enum class Features {
     kWebGPUUseSpirv14,
     kWebGPUDecomposeUniformBuffers,
     kWebGPUUseHLSL2021,
+    kWebGPUUseSpirvReconvergenceMode,
 };
 
 class DAWN_PLATFORM_EXPORT Platform {
@@ -200,6 +193,10 @@ class DAWN_PLATFORM_EXPORT Platform {
     // Hook for querying if a Finch feature is enabled.
     virtual bool IsFeatureEnabled(Features feature);
 
+    // Report GPU process progress so that the watchdog thread won't think that a long function is
+    // stuck.
+    virtual void ReportProgress();
+
   private:
     Platform(const Platform&) = delete;
     Platform& operator=(const Platform&) = delete;