@shopify/react-native-skia 0.1.213 → 0.1.214

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

@@ -23,6 +23,8 @@
 #include "include/private/base/SkTemplates.h"
 #include "include/private/base/SkTo.h"
 #include "include/private/base/SkTypeTraits.h"
+#include "include/sksl/SkSLDebugTrace.h"
+#include "include/sksl/SkSLVersion.h"
 
 #include <cstddef>
 #include <cstdint>
@@ -34,16 +36,7 @@
 #include <utility>
 #include <vector>
 
-#ifdef SK_ENABLE_SKSL
-
-#include "include/sksl/SkSLDebugTrace.h"
-#include "include/sksl/SkSLVersion.h"
-
-class GrRecordingContext;
-class SkFilterColorProgram;
-class SkImage;
 struct SkIPoint;
-struct SkImageInfo;
 
 namespace SkSL {
 class DebugTracePriv;
@@ -217,25 +210,18 @@ public:
                                size_t childCount,
                                const SkMatrix* localMatrix = nullptr) const;
     sk_sp<SkShader> makeShader(sk_sp<const SkData> uniforms,
-                               SkSpan<ChildPtr> children,
+                               SkSpan<const ChildPtr> children,
                                const SkMatrix* localMatrix = nullptr) const;
 
-    sk_sp<SkImage> makeImage(GrRecordingContext*,
-                             sk_sp<const SkData> uniforms,
-                             SkSpan<ChildPtr> children,
-                             const SkMatrix* localMatrix,
-                             SkImageInfo resultInfo,
-                             bool mipmapped) const;
-
     sk_sp<SkColorFilter> makeColorFilter(sk_sp<const SkData> uniforms) const;
     sk_sp<SkColorFilter> makeColorFilter(sk_sp<const SkData> uniforms,
                                          sk_sp<SkColorFilter> children[],
                                          size_t childCount) const;
     sk_sp<SkColorFilter> makeColorFilter(sk_sp<const SkData> uniforms,
-                                         SkSpan<ChildPtr> children) const;
+                                         SkSpan<const ChildPtr> children) const;
 
     sk_sp<SkBlender> makeBlender(sk_sp<const SkData> uniforms,
-                                 SkSpan<ChildPtr> children = {}) const;
+                                 SkSpan<const ChildPtr> children = {}) const;
 
     /**
      * Creates a new Runtime Effect patterned after an already-existing one. The new shader behaves
@@ -281,14 +267,15 @@ public:
 
 private:
     enum Flags {
-        kUsesSampleCoords_Flag   = 0x01,
-        kAllowColorFilter_Flag   = 0x02,
-        kAllowShader_Flag        = 0x04,
-        kAllowBlender_Flag       = 0x08,
-        kSamplesOutsideMain_Flag = 0x10,
-        kUsesColorTransform_Flag = 0x20,
-        kAlwaysOpaque_Flag       = 0x40,
-        kAlphaUnchanged_Flag     = 0x80,
+        kUsesSampleCoords_Flag    = 0x001,
+        kAllowColorFilter_Flag    = 0x002,
+        kAllowShader_Flag         = 0x004,
+        kAllowBlender_Flag        = 0x008,
+        kSamplesOutsideMain_Flag  = 0x010,
+        kUsesColorTransform_Flag  = 0x020,
+        kAlwaysOpaque_Flag        = 0x040,
+        kAlphaUnchanged_Flag      = 0x080,
+        kDisableOptimization_Flag = 0x100,
     };
 
     SkRuntimeEffect(std::unique_ptr<SkSL::Program> baseProgram,
@@ -316,7 +303,6 @@ private:
     bool alwaysOpaque()       const { return (fFlags & kAlwaysOpaque_Flag);       }
     bool isAlphaUnchanged()   const { return (fFlags & kAlphaUnchanged_Flag);     }
 
-    const SkFilterColorProgram* getFilterColorProgram() const;
     const SkSL::RP::Program* getRPProgram(SkSL::DebugTracePriv* debugTrace) const;
 
 #if defined(SK_GANESH)
@@ -328,7 +314,6 @@ private:
     friend class SkRuntimeBlender;      //
     friend class SkRuntimeColorFilter;  //
 
-    friend class SkFilterColorProgram;
     friend class SkRuntimeEffectPriv;
 
     uint32_t fHash;
@@ -341,8 +326,6 @@ private:
     std::vector<Child> fChildren;
     std::vector<SkSL::SampleUsage> fSampleUsages;
 
-    std::unique_ptr<SkFilterColorProgram> fFilterColorProgram;
-
     uint32_t fFlags;  // Flags
 };
 
@@ -434,8 +417,8 @@ public:
 
     // Get access to the collated uniforms and children (in the order expected by APIs like
     // makeShader on the effect):
-    sk_sp<const SkData> uniforms() { return fUniforms; }
-    SkSpan<SkRuntimeEffect::ChildPtr> children() { return fChildren; }
+    sk_sp<const SkData> uniforms() const { return fUniforms; }
+    SkSpan<const SkRuntimeEffect::ChildPtr> children() const { return fChildren; }
 
 protected:
     SkRuntimeEffectBuilder() = delete;
@@ -495,17 +478,11 @@ public:
     SkRuntimeShaderBuilder(const SkRuntimeShaderBuilder&) = default;
     ~SkRuntimeShaderBuilder();
 
-    sk_sp<SkShader> makeShader(const SkMatrix* localMatrix = nullptr);
-    sk_sp<SkImage> makeImage(GrRecordingContext*,
-                             const SkMatrix* localMatrix,
-                             SkImageInfo resultInfo,
-                             bool mipmapped);
+    sk_sp<SkShader> makeShader(const SkMatrix* localMatrix = nullptr) const;
 
 private:
-    using INHERITED = SkRuntimeEffectBuilder;
-
     explicit SkRuntimeShaderBuilder(sk_sp<SkRuntimeEffect> effect, sk_sp<SkData> uniforms)
-            : INHERITED(std::move(effect), std::move(uniforms)) {}
+            : SkRuntimeEffectBuilder(std::move(effect), std::move(uniforms)) {}
 
     friend class SkRuntimeImageFilter;
 };
@@ -521,10 +498,7 @@ public:
     SkRuntimeColorFilterBuilder(const SkRuntimeColorFilterBuilder&) = delete;
     SkRuntimeColorFilterBuilder& operator=(const SkRuntimeColorFilterBuilder&) = delete;
 
-    sk_sp<SkColorFilter> makeColorFilter();
-
-private:
-    using INHERITED = SkRuntimeEffectBuilder;
+    sk_sp<SkColorFilter> makeColorFilter() const;
 };
 
 /**
@@ -538,12 +512,7 @@ public:
     SkRuntimeBlendBuilder(const SkRuntimeBlendBuilder&) = delete;
     SkRuntimeBlendBuilder& operator=(const SkRuntimeBlendBuilder&) = delete;
 
-    sk_sp<SkBlender> makeBlender();
-
-private:
-    using INHERITED = SkRuntimeEffectBuilder;
+    sk_sp<SkBlender> makeBlender() const;
 };
 
-#endif  // SK_ENABLE_SKSL
-
 #endif  // SkRuntimeEffect_DEFINED

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

@@ -24,6 +24,11 @@ enum class BackendApi : unsigned {
     kMetal,
     kVulkan,
     kMock,
+
+    /**
+     * Graphite doesn't support some context types (e.g. Direct3D) and will return Unsupported.
+     */
+    kUnsupported,
 };
 
 /** Indicates whether an allocation should count against a cache budget. */
@@ -66,6 +71,14 @@ enum class Renderable : bool {
     kYes = true,
 };
 
+/**
+ * What is the logical origin of a BackendTexture passed into Skia
+ */
+enum class Origin : unsigned {
+    kTopLeft,
+    kBottomLeft,
+};
+
 } // namespace skgpu