@shopify/react-native-skia 1.3.13 → 1.4.0

package/cpp/skia/include/effects/SkImageFilters.h

@@ -9,6 +9,7 @@
 #define SkImageFilters_DEFINED
 
 #include "include/core/SkColor.h"
+#include "include/core/SkColorSpace.h"
 #include "include/core/SkImage.h"
 #include "include/core/SkImageFilter.h"
 #include "include/core/SkPicture.h"
@@ -27,7 +28,7 @@
 class SkBlender;
 class SkColorFilter;
 class SkMatrix;
-class SkRuntimeShaderBuilder;
+class SkRuntimeEffectBuilder;
 enum class SkBlendMode;
 struct SkIPoint;
 struct SkISize;
@@ -188,34 +189,59 @@ public:
     /**
      *  Create a filter that draws a drop shadow under the input content. This filter produces an
      *  image that includes the inputs' content.
-     *  @param dx       The X offset of the shadow.
-     *  @param dy       The Y offset of the shadow.
-     *  @param sigmaX   The blur radius for the shadow, along the X axis.
-     *  @param sigmaY   The blur radius for the shadow, along the Y axis.
-     *  @param color    The color of the drop shadow.
-     *  @param input    The input filter, or will use the source bitmap if this is null.
-     *  @param cropRect Optional rectangle that crops the input and output.
+     *  @param dx         X offset of the shadow.
+     *  @param dy         Y offset of the shadow.
+     *  @param sigmaX     blur radius for the shadow, along the X axis.
+     *  @param sigmaY     blur radius for the shadow, along the Y axis.
+     *  @param color      color of the drop shadow.
+     *  @param colorSpace The color space of the drop shadow color.
+     *  @param input      The input filter, or will use the source bitmap if this is null.
+     *  @param cropRect   Optional rectangle that crops the input and output.
      */
     static sk_sp<SkImageFilter> DropShadow(SkScalar dx, SkScalar dy,
                                            SkScalar sigmaX, SkScalar sigmaY,
-                                           SkColor color, sk_sp<SkImageFilter> input,
+                                           SkColor4f color, sk_sp<SkColorSpace> colorSpace,
+                                           sk_sp<SkImageFilter> input,
                                            const CropRect& cropRect = {});
+    static sk_sp<SkImageFilter> DropShadow(SkScalar dx, SkScalar dy,
+                                           SkScalar sigmaX, SkScalar sigmaY,
+                                           SkColor color, sk_sp<SkImageFilter> input,
+                                           const CropRect& cropRect = {}) {
+        return DropShadow(dx, dy,
+                          sigmaX, sigmaY,
+                          SkColor4f::FromColor(color), /*colorSpace=*/nullptr,
+                          std::move(input),
+                          cropRect);
+    }
+
     /**
      *  Create a filter that renders a drop shadow, in exactly the same manner as ::DropShadow,
      *  except that the resulting image does not include the input content. This allows the shadow
      *  and input to be composed by a filter DAG in a more flexible manner.
-     *  @param dx       The X offset of the shadow.
-     *  @param dy       The Y offset of the shadow.
-     *  @param sigmaX   The blur radius for the shadow, along the X axis.
-     *  @param sigmaY   The blur radius for the shadow, along the Y axis.
-     *  @param color    The color of the drop shadow.
-     *  @param input    The input filter, or will use the source bitmap if this is null.
-     *  @param cropRect Optional rectangle that crops the input and output.
+     *  @param dx         The X offset of the shadow.
+     *  @param dy         The Y offset of the shadow.
+     *  @param sigmaX     The blur radius for the shadow, along the X axis.
+     *  @param sigmaY     The blur radius for the shadow, along the Y axis.
+     *  @param color      The color of the drop shadow.
+     *  @param colorSpace The color space of the drop shadow color.
+     *  @param input      The input filter, or will use the source bitmap if this is null.
+     *  @param cropRect   Optional rectangle that crops the input and output.
      */
     static sk_sp<SkImageFilter> DropShadowOnly(SkScalar dx, SkScalar dy,
                                                SkScalar sigmaX, SkScalar sigmaY,
-                                               SkColor color, sk_sp<SkImageFilter> input,
+                                               SkColor4f color, sk_sp<SkColorSpace>,
+                                               sk_sp<SkImageFilter> input,
                                                const CropRect& cropRect = {});
+    static sk_sp<SkImageFilter> DropShadowOnly(SkScalar dx, SkScalar dy,
+                                               SkScalar sigmaX, SkScalar sigmaY,
+                                               SkColor color, sk_sp<SkImageFilter> input,
+                                               const CropRect& cropRect = {}) {
+        return DropShadowOnly(dx, dy,
+                              sigmaX, sigmaY,
+                              SkColor4f::FromColor(color), /*colorSpace=*/nullptr,
+                              std::move(input),
+                              cropRect);
+    }
 
     /**
      * Create a filter that always produces transparent black.
@@ -356,7 +382,7 @@ public:
 
     /**
      *  Create a filter that fills the output with the per-pixel evaluation of the SkShader produced
-     *  by the SkRuntimeShaderBuilder. The shader is defined in the image filter's local coordinate
+     *  by the SkRuntimeEffectBuilder. The shader is defined in the image filter's local coordinate
      *  system, so it will automatically be affected by SkCanvas' transform.
      *
      *  This variant assumes that the runtime shader samples 'childShaderName' with the same input
@@ -373,7 +399,7 @@ public:
      *  @param input           The image filter that will be provided as input to the runtime
      *                         shader. If null the implicit source image is used instead
      */
-    static sk_sp<SkImageFilter> RuntimeShader(const SkRuntimeShaderBuilder& builder,
+    static sk_sp<SkImageFilter> RuntimeShader(const SkRuntimeEffectBuilder& builder,
                                               std::string_view childShaderName,
                                               sk_sp<SkImageFilter> input) {
         return RuntimeShader(builder, /*sampleRadius=*/0.f, childShaderName, std::move(input));
@@ -390,14 +416,14 @@ public:
      *
      * This requires a GPU backend or SkSL to be compiled in.
     */
-    static sk_sp<SkImageFilter> RuntimeShader(const SkRuntimeShaderBuilder& builder,
+    static sk_sp<SkImageFilter> RuntimeShader(const SkRuntimeEffectBuilder& builder,
                                               SkScalar sampleRadius,
                                               std::string_view childShaderName,
                                               sk_sp<SkImageFilter> input);
 
     /**
      *  Create a filter that fills the output with the per-pixel evaluation of the SkShader produced
-     *  by the SkRuntimeShaderBuilder. The shader is defined in the image filter's local coordinate
+     *  by the SkRuntimeEffectBuilder. The shader is defined in the image filter's local coordinate
      *  system, so it will automatically be affected by SkCanvas' transform.
      *
      *  This requires a GPU backend or SkSL to be compiled in.
@@ -412,7 +438,7 @@ public:
      *                          shader. If any are null, the implicit source image is used instead.
      *  @param inputCount       How many entries are present in 'childShaderNames' and 'inputs'.
      */
-    static sk_sp<SkImageFilter> RuntimeShader(const SkRuntimeShaderBuilder& builder,
+    static sk_sp<SkImageFilter> RuntimeShader(const SkRuntimeEffectBuilder& builder,
                                               std::string_view childShaderNames[],
                                               const sk_sp<SkImageFilter> inputs[],
                                               int inputCount) {
@@ -429,7 +455,7 @@ public:
      *
      *  This requires a GPU backend or SkSL to be compiled in.
      */
-    static sk_sp<SkImageFilter> RuntimeShader(const SkRuntimeShaderBuilder& builder,
+    static sk_sp<SkImageFilter> RuntimeShader(const SkRuntimeEffectBuilder& builder,
                                               SkScalar maxSampleRadius,
                                               std::string_view childShaderNames[],
                                               const sk_sp<SkImageFilter> inputs[],

package/cpp/skia/include/effects/SkRuntimeEffect.h

@@ -134,6 +134,8 @@ public:
         // This flag allows Runtime Effects to access Skia implementation details like sk_FragCoord
         // and functions with private identifiers (e.g. $rgb_to_hsl).
         bool allowPrivateAccess = false;
+        // When not 0, this field allows Skia to assign a stable key to a known runtime effect
+        uint32_t fStableKey = 0;
 
         // TODO(skia:11209) - Replace this with a promised SkCapabilities?
         // This flag lifts the ES2 restrictions on Runtime Effects that are gated by the
@@ -313,6 +315,7 @@ private:
     friend class SkRuntimeEffectPriv;
 
     uint32_t fHash;
+    uint32_t fStableKey;
 
     std::unique_ptr<SkSL::Program> fBaseProgram;
     std::unique_ptr<SkSL::RP::Program> fRPProgram;
@@ -325,9 +328,45 @@ private:
     uint32_t fFlags;  // Flags
 };
 
-/** Base class for SkRuntimeShaderBuilder, defined below. */
+/**
+ * SkRuntimeEffectBuilder is a utility to simplify creating SkShader, SkColorFilter, and SkBlender
+ * objects from SkRuntimeEffects.
+ *
+ * NOTE: Like SkRuntimeEffect, this API is experimental and subject to change!
+ *
+ * Given an SkRuntimeEffect, the SkRuntimeEffectBuilder manages creating an input data block and
+ * provides named access to the 'uniform' variables in that block, as well as named access
+ * to a list of child shader slots. Usage:
+ *
+ *   sk_sp<SkRuntimeEffect> effect = ...;
+ *   SkRuntimeEffectBuilder builder(effect);
+ *   builder.uniform("some_uniform_float")  = 3.14f;
+ *   builder.uniform("some_uniform_matrix") = SkM44::Rotate(...);
+ *   builder.child("some_child_effect")     = mySkImage->makeShader(...);
+ *   ...
+ *   sk_sp<SkShader> shader = builder.makeShader(nullptr, false);
+ *
+ * Upon calling makeShader, makeColorFilter, or makeBlender, the builder will check the validity
+ * of the SkSL to see if the entry point is correct.
+ *
+ * Note that SkRuntimeEffectBuilder is built entirely on the public API of SkRuntimeEffect,
+ * so can be used as-is or serve as inspiration for other interfaces or binding techniques.
+ */
 class SkRuntimeEffectBuilder {
 public:
+    explicit SkRuntimeEffectBuilder(sk_sp<SkRuntimeEffect> effect)
+            : fEffect(std::move(effect))
+            , fUniforms(SkData::MakeZeroInitialized(fEffect->uniformSize()))
+            , fChildren(fEffect->children().size()) {}
+    explicit SkRuntimeEffectBuilder(sk_sp<SkRuntimeEffect> effect, sk_sp<SkData> uniforms)
+            : fEffect(std::move(effect))
+            , fUniforms(std::move(uniforms))
+            , fChildren(fEffect->children().size()) {}
+
+    // This is currently required by Android Framework but may go away if that dependency
+    // can be removed.
+    SkRuntimeEffectBuilder(const SkRuntimeEffectBuilder&) = default;
+
     struct BuilderUniform {
         // Copy 'val' to this variable. No type conversion is performed - 'val' must be same
         // size as expected by the effect. Information about the variable can be queried by
@@ -416,19 +455,17 @@ public:
     sk_sp<const SkData> uniforms() const { return fUniforms; }
     SkSpan<const SkRuntimeEffect::ChildPtr> children() const { return fChildren; }
 
+    // Build methods, at this point checks are made to ensure the SkSL entry point `main` is correct
+    sk_sp<SkShader> makeShader(const SkMatrix* localMatrix = nullptr) const;
+    sk_sp<SkColorFilter> makeColorFilter() const;
+    sk_sp<SkBlender> makeBlender() const;
+
+    ~SkRuntimeEffectBuilder() = default;
+
 protected:
     SkRuntimeEffectBuilder() = delete;
-    explicit SkRuntimeEffectBuilder(sk_sp<SkRuntimeEffect> effect)
-            : fEffect(std::move(effect))
-            , fUniforms(SkData::MakeZeroInitialized(fEffect->uniformSize()))
-            , fChildren(fEffect->children().size()) {}
-    explicit SkRuntimeEffectBuilder(sk_sp<SkRuntimeEffect> effect, sk_sp<SkData> uniforms)
-            : fEffect(std::move(effect))
-            , fUniforms(std::move(uniforms))
-            , fChildren(fEffect->children().size()) {}
 
     SkRuntimeEffectBuilder(SkRuntimeEffectBuilder&&) = default;
-    SkRuntimeEffectBuilder(const SkRuntimeEffectBuilder&) = default;
 
     SkRuntimeEffectBuilder& operator=(SkRuntimeEffectBuilder&&) = delete;
     SkRuntimeEffectBuilder& operator=(const SkRuntimeEffectBuilder&) = delete;
@@ -444,71 +481,15 @@ private:
     sk_sp<SkRuntimeEffect>                 fEffect;
     sk_sp<SkData>                          fUniforms;
     std::vector<SkRuntimeEffect::ChildPtr> fChildren;
-};
-
-/**
- * SkRuntimeShaderBuilder is a utility to simplify creating SkShader objects from SkRuntimeEffects.
- *
- * NOTE: Like SkRuntimeEffect, this API is experimental and subject to change!
- *
- * Given an SkRuntimeEffect, the SkRuntimeShaderBuilder manages creating an input data block and
- * provides named access to the 'uniform' variables in that block, as well as named access
- * to a list of child shader slots. Usage:
- *
- *   sk_sp<SkRuntimeEffect> effect = ...;
- *   SkRuntimeShaderBuilder builder(effect);
- *   builder.uniform("some_uniform_float")  = 3.14f;
- *   builder.uniform("some_uniform_matrix") = SkM44::Rotate(...);
- *   builder.child("some_child_effect")     = mySkImage->makeShader(...);
- *   ...
- *   sk_sp<SkShader> shader = builder.makeShader(nullptr, false);
- *
- * Note that SkRuntimeShaderBuilder is built entirely on the public API of SkRuntimeEffect,
- * so can be used as-is or serve as inspiration for other interfaces or binding techniques.
- */
-class SK_API SkRuntimeShaderBuilder : public SkRuntimeEffectBuilder {
-public:
-    explicit SkRuntimeShaderBuilder(sk_sp<SkRuntimeEffect>);
-    // This is currently required by Android Framework but may go away if that dependency
-    // can be removed.
-    SkRuntimeShaderBuilder(const SkRuntimeShaderBuilder&) = default;
-    ~SkRuntimeShaderBuilder();
-
-    sk_sp<SkShader> makeShader(const SkMatrix* localMatrix = nullptr) const;
-
-private:
-    explicit SkRuntimeShaderBuilder(sk_sp<SkRuntimeEffect> effect, sk_sp<SkData> uniforms)
-            : SkRuntimeEffectBuilder(std::move(effect), std::move(uniforms)) {}
 
     friend class SkRuntimeImageFilter;
 };
 
 /**
- * SkRuntimeColorFilterBuilder makes it easy to setup and assign uniforms to runtime color filters.
- */
-class SK_API SkRuntimeColorFilterBuilder : public SkRuntimeEffectBuilder {
-public:
-    explicit SkRuntimeColorFilterBuilder(sk_sp<SkRuntimeEffect>);
-    ~SkRuntimeColorFilterBuilder();
-
-    SkRuntimeColorFilterBuilder(const SkRuntimeColorFilterBuilder&) = delete;
-    SkRuntimeColorFilterBuilder& operator=(const SkRuntimeColorFilterBuilder&) = delete;
-
-    sk_sp<SkColorFilter> makeColorFilter() const;
-};
-
-/**
- * SkRuntimeBlendBuilder is a utility to simplify creation and uniform setup of runtime blenders.
+ * DEPRECATED: Subclass logic has been moved to base class SkRuntimeEffectBuilder.
  */
-class SK_API SkRuntimeBlendBuilder : public SkRuntimeEffectBuilder {
-public:
-    explicit SkRuntimeBlendBuilder(sk_sp<SkRuntimeEffect>);
-    ~SkRuntimeBlendBuilder();
-
-    SkRuntimeBlendBuilder(const SkRuntimeBlendBuilder&) = delete;
-    SkRuntimeBlendBuilder& operator=(const SkRuntimeBlendBuilder&) = delete;
-
-    sk_sp<SkBlender> makeBlender() const;
-};
+using SkRuntimeShaderBuilder = SkRuntimeEffectBuilder;
+using SkRuntimeColorFilterBuilder = SkRuntimeEffectBuilder;
+using SkRuntimeBlendBuilder = SkRuntimeEffectBuilder;
 
 #endif  // SkRuntimeEffect_DEFINED

package/cpp/skia/include/effects/SkShaderMaskFilter.h

@@ -14,6 +14,8 @@
 class SkMaskFilter;
 class SkShader;
 
+// (DEPRECATED) This factory function is deprecated. ShaderMaskFilters will be deleted entirely
+// in an upcoming Skia release.
 class SK_API SkShaderMaskFilter {
 public:
     static sk_sp<SkMaskFilter> Make(sk_sp<SkShader> shader);

package/cpp/skia/include/effects/SkTableMaskFilter.h

@@ -20,6 +20,8 @@ class SkMaskFilter;
     Applies a table lookup on each of the alpha values in the mask.
     Helper methods create some common tables (e.g. gamma, clipping)
  */
+// (DEPRECATED) These factory functions are deprecated. The TableMaskFilter will be
+// removed entirely in an upcoming release of Skia.
 class SK_API SkTableMaskFilter {
 public:
     /** Utility that sets the gamma table

package/cpp/skia/include/gpu/GrBackendSemaphore.h

@@ -4,123 +4,5 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-
-#ifndef GrBackendSemaphore_DEFINED
-#define GrBackendSemaphore_DEFINED
-
-#include "include/gpu/GrTypes.h"  // IWYU pragma: keep
-#include "include/private/base/SkAPI.h"
-#include "include/private/base/SkAnySubclass.h"
-
-#ifdef SK_METAL
-#include "include/gpu/mtl/GrMtlTypes.h"
-#endif
-
-#if defined(SK_VULKAN) && !defined(SK_DISABLE_LEGACY_VULKAN_BACKENDSEMAPHORE)
-#include "include/private/gpu/vk/SkiaVulkan.h"
-#endif
-
-#ifdef SK_DIRECT3D
-#include "include/private/gpu/ganesh/GrD3DTypesMinimal.h"
-#endif
-
-#include <cstddef>
-
-class GrBackendSemaphoreData;
-
-/**
- * Wrapper class for passing into and receiving data from Ganesh about a backend semaphore object.
- */
-class SK_API GrBackendSemaphore {
-public:
-    // The GrBackendSemaphore cannot be used until either init* is called, which will set the
-    // appropriate GrBackend.
-    GrBackendSemaphore();
-    ~GrBackendSemaphore();
-    GrBackendSemaphore(const GrBackendSemaphore&);
-    GrBackendSemaphore& operator=(const GrBackendSemaphore&);
-
-#if defined(SK_VULKAN) && !defined(SK_DISABLE_LEGACY_VULKAN_BACKENDSEMAPHORE)
-    void initVulkan(VkSemaphore semaphore);
-    VkSemaphore vkSemaphore() const;
-#endif
-
-#ifdef SK_METAL
-    // It is the creator's responsibility to ref the MTLEvent passed in here, via __bridge_retained.
-    // The other end will wrap this BackendSemaphore and take the ref, via __bridge_transfer.
-    void initMetal(GrMTLHandle event, uint64_t value) {
-        fBackend = GrBackendApi::kMetal;
-        fMtlEvent = event;
-        fMtlValue = value;
-
-        fIsInitialized = true;
-    }
-
-    GrMTLHandle mtlSemaphore() const {
-        if (!fIsInitialized || GrBackendApi::kMetal != fBackend) {
-            return nullptr;
-        }
-        return fMtlEvent;
-    }
-
-    uint64_t mtlValue() const {
-        if (!fIsInitialized || GrBackendApi::kMetal != fBackend) {
-            return 0;
-        }
-        return fMtlValue;
-    }
-
-#endif
-
-#ifdef SK_DIRECT3D
-    void initDirect3D(const GrD3DFenceInfo& info) {
-        fBackend = GrBackendApi::kDirect3D;
-        this->assignD3DFenceInfo(info);
-        fIsInitialized = true;
-    }
-#endif
-
-    bool isInitialized() const { return fIsInitialized; }
-    GrBackendApi backend() const { return fBackend; }
-
-#ifdef SK_DIRECT3D
-    bool getD3DFenceInfo(GrD3DFenceInfo* outInfo) const;
-#endif
-
-private:
-    friend class GrBackendSemaphorePriv;
-    friend class GrBackendSemaphoreData;
-    // Size determined by looking at the GrBackendSemaphoreData subclasses, then
-    // guessing-and-checking. Compiler will complain if this is too small - in that case,
-    // just increase the number.
-    inline constexpr static size_t kMaxSubclassSize = 16;
-    using AnySemaphoreData = SkAnySubclass<GrBackendSemaphoreData, kMaxSubclassSize>;
-
-    template <typename SemaphoreData>
-    GrBackendSemaphore(GrBackendApi api, SemaphoreData data) : fBackend(api), fIsInitialized(true) {
-        fSemaphoreData.emplace<SemaphoreData>(data);
-    }
-
-#ifdef SK_DIRECT3D
-    void assignD3DFenceInfo(const GrD3DFenceInfo& info);
-#endif
-
-    GrBackendApi fBackend;
-    AnySemaphoreData fSemaphoreData;
-
-    union {
-        void* fPlaceholder;  // TODO(293490566)
-#ifdef SK_METAL
-        GrMTLHandle fMtlEvent;    // Expected to be an id<MTLEvent>
-#endif
-#ifdef SK_DIRECT3D
-        GrD3DFenceInfo* fD3DFenceInfo;
-#endif
-    };
-#ifdef SK_METAL
-    uint64_t fMtlValue;
-#endif
-    bool fIsInitialized;
-};
-
-#endif
+// TODO(kjlubick, egdaniel) Delete this after migrating clients.
+#include "include/gpu/ganesh/GrBackendSemaphore.h"