Merge pull request #519 from Shopify/feature/491-upgrade-skia-m103

Upgrade skia to Release M103

Author: chrfalch

example/ios/Podfile.lock

@@ -571,7 +571,7 @@ SPEC CHECKSUMS:
   React-jsinspector: 90f0bfd5d04e0b066c29216a110ffb9a6c34f23f
   React-logger: 8474fefa09d05f573a13c044cb0dfd751d4e52e3
   react-native-safe-area-context: f98b0b16d1546d208fc293b4661e3f81a895afd9
-  react-native-skia: 36624327c4ecaf4412a5907ff1e8412aa9b4eb76
+  react-native-skia: 57f0f077c9acde81e26caa35d7d8958439762d14
   React-perflogger: 15cb741d6c2379f4d3fc8f9e4d4e1110ef3020cb
   React-RCTActionSheet: ea9099db0597bd769430db1e2d011fd5fdb7fc5e
   React-RCTAnimation: 252df4749866f2654f37612f839522cac91c1165

externals/skia

@@ -15,6 +15,7 @@
 
 #include "include/gpu/GrDirectContext.h"
 #include "include/gpu/gl/GrGLInterface.h"
+#include <SkColorSpace.h>
 #include <SkCanvas.h>
 #include <SkSurface.h>
 #include <SkPicture.h>

package/android/cpp/rnskia-android/SkiaOpenGLRenderer.h

@@ -44,12 +44,11 @@ namespace RNSkia
     JSI_HOST_FUNCTION(makeShader)
     {
       auto uniforms = castUniforms(runtime, arguments[0]);
-      auto isOpaque = count >= 2 && arguments[1].isBool() ? arguments[1].getBool() : false;
-      auto matrix = count >= 3 && !arguments[2].isUndefined()  && !arguments[2].isNull()  ? JsiSkMatrix::fromValue(runtime, arguments[2]).get() : nullptr;
+      
+      auto matrix = count >= 2 && !arguments[1].isUndefined()  && !arguments[1].isNull()  ? JsiSkMatrix::fromValue(runtime, arguments[1]).get() : nullptr;
 
       // Create and return shader as host object
-      auto shader = getObject()->makeShader(std::move(uniforms), nullptr,
-                                            0, matrix, isOpaque);
+      auto shader = getObject()->makeShader(std::move(uniforms), nullptr, 0, matrix);
 
       return jsi::Object::createFromHostObject(
           runtime, std::make_shared<JsiSkShader>(getContext(), std::move(shader)));
@@ -58,11 +57,10 @@ namespace RNSkia
     JSI_HOST_FUNCTION(makeShaderWithChildren)
     {
       auto uniforms = castUniforms(runtime, arguments[0]);
-      auto isOpaque = count >= 2 && arguments[1].isBool() ? arguments[1].getBool() : false;
-
+      
       // Children
       std::vector<sk_sp<SkShader>> children;
-      auto jsiChildren = arguments[2].asObject(runtime).asArray(runtime);
+      auto jsiChildren = arguments[1].asObject(runtime).asArray(runtime);
       auto jsiChildCount = jsiChildren.size(runtime);
       children.reserve(jsiChildCount);
       for (int i = 0; i < jsiChildCount; i++)
@@ -74,11 +72,11 @@ namespace RNSkia
         children.push_back(shader);
       }
 
-      auto matrix = count >= 4 && !arguments[3].isUndefined()  && !arguments[3].isNull() ? JsiSkMatrix::fromValue(runtime, arguments[3]).get() : nullptr;
+      auto matrix = count >= 3 && !arguments[2].isUndefined()  && !arguments[2].isNull() ? JsiSkMatrix::fromValue(runtime, arguments[2]).get() : nullptr;
 
       // Create and return shader as host object
       auto shader = getObject()->makeShader(std::move(uniforms), children.data(),
-                                            children.size(), matrix, isOpaque);
+                                            children.size(), matrix);
 
       return jsi::Object::createFromHostObject(
           runtime, std::make_shared<JsiSkShader>(getContext(), std::move(shader)));

package/cpp/api/JsiSkRuntimeEffect.h

@@ -3,6 +3,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
+#import <SkColorSpace.h>
 #import <SkSurface.h>
 #import <SkCanvas.h>
 

package/ios/RNSkia-iOS/RNSkDrawViewImpl.mm

@@ -30,12 +30,11 @@ const processValue = (value: UniformValue): number | readonly number[] => {
 export interface ShaderProps extends TransformProps {
   source: SkRuntimeEffect;
   uniforms: Uniforms;
-  opaque?: boolean;
   children?: ReactNode | ReactNode[];
 }
 
 const onDeclare = createDeclaration<ShaderProps>(
-  ({ uniforms, source, opaque, ...transform }, children) => {
+  ({ uniforms, source, ...transform }, children) => {
     const processedUniforms = new Array(source.getUniformCount())
       .fill(0)
       .flatMap((_, i) => {
@@ -68,7 +67,6 @@ const onDeclare = createDeclaration<ShaderProps>(
     }
     return source.makeShaderWithChildren(
       processedUniforms,
-      opaque,
       children.filter(isShader),
       localMatrix(transform)
     );

package/src/renderer/components/shaders/Shader.tsx

@@ -16,25 +16,18 @@ export interface SkRuntimeEffect extends SkJSIInstance<"RuntimeEffect"> {
   /**
    * Returns a shader executed using the given uniform data.
    * @param uniforms
-   * @param isOpaque
    * @param localMatrix
    */
-  makeShader(
-    uniforms: number[],
-    isOpaque?: boolean,
-    localMatrix?: SkMatrix
-  ): SkShader;
+  makeShader(uniforms: number[], localMatrix?: SkMatrix): SkShader;
 
   /**
    * Returns a shader executed using the given uniform data and the children as inputs.
    * @param uniforms
-   * @param isOpaque
    * @param children
    * @param localMatrix
    */
   makeShaderWithChildren(
     uniforms: number[],
-    isOpaque?: boolean,
     children?: SkShader[],
     localMatrix?: SkMatrix
   ): SkShader;