@shopify/react-native-skia 0.1.155 → 0.1.157

package/cpp/api/JsiSkRSXform.h

@@ -16,90 +16,87 @@
 
 namespace RNSkia {
 
-    using namespace facebook;
-
-    class JsiSkRSXform : public JsiSkWrappingSharedPtrHostObject<SkRSXform> {
-    public:
-        JsiSkRSXform(std::shared_ptr<RNSkPlatformContext> context, const SkRSXform &rsxform)
-                : JsiSkWrappingSharedPtrHostObject<SkRSXform>(
-                std::move(context), std::make_shared<SkRSXform>(rsxform)){}
-
-        // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-
-        JSI_PROPERTY_GET(__typename__) {
-          return jsi::String::createFromUtf8(runtime, "RSXform");
-        }
-
-        JSI_PROPERTY_GET(scos) {
-          return jsi::Value(SkScalarToDouble(getObject()->fSCos));
-        }
-        JSI_PROPERTY_GET(ssin) {
-          return jsi::Value(SkScalarToDouble(getObject()->fSSin));
-        }
-        JSI_PROPERTY_GET(tx) {
-          return jsi::Value(SkScalarToDouble(getObject()->fTx));
-        }
-        JSI_PROPERTY_GET(ty) {
-          return jsi::Value(SkScalarToDouble(getObject()->fTy));
-        }
-
-        JSI_EXPORT_PROPERTY_GETTERS(
-            JSI_EXPORT_PROP_GET(JsiSkRSXform, __typename__),
-            JSI_EXPORT_PROP_GET(JsiSkRSXform, scos),
-            JSI_EXPORT_PROP_GET(JsiSkRSXform, ssin),
-            JSI_EXPORT_PROP_GET(JsiSkRSXform, tx),
-            JSI_EXPORT_PROP_GET(JsiSkRSXform, ty),
-        )
-
-        /**
-        Returns the underlying object from a host object of this type
-       */
-        static std::shared_ptr<SkRSXform> fromValue(jsi::Runtime &runtime,
-                                                  const jsi::Value &obj) {
-            const auto& object = obj.asObject(runtime);
-            if (object.isHostObject(runtime)) {
-                return object
-                        .asHostObject<JsiSkRSXform>(runtime)
-                        ->getObject();
-            } else {
-                auto scos = object.getArray(runtime).getValueAtIndex(runtime, 0).asNumber();
-                auto ssin = object.getArray(runtime).getValueAtIndex(runtime, 1).asNumber();
-                auto tx = object.getArray(runtime).getValueAtIndex(runtime, 2).asNumber();
-                auto ty = object.getArray(runtime).getValueAtIndex(runtime, 3).asNumber();
-                return std::make_shared<SkRSXform>(SkRSXform::Make(scos, ssin, tx, ty));
-            }
-        }
-
-        /**
-        Returns the jsi object from a host object of this type
-       */
-        static jsi::Value toValue(jsi::Runtime &runtime,
-                                  std::shared_ptr<RNSkPlatformContext> context,
-                                  const SkRSXform &rsxform) {
-            return jsi::Object::createFromHostObject(
-                    runtime, std::make_shared<JsiSkRSXform>(std::move(context), rsxform));
-        }
-
-        /**
-         * Creates the function for construction a new instance of the SkRSXform
-         * wrapper
-         * @param context platform context
-         * @return A function for creating a new host object wrapper for the SkRSXform
-         * class
-         */
-        static const jsi::HostFunctionType
-        createCtor(std::shared_ptr<RNSkPlatformContext> context) {
-            return JSI_HOST_FUNCTION_LAMBDA {
-                    auto rsxform = SkRSXform::Make(
-                            arguments[0].asNumber(),
-                            arguments[1].asNumber(),
-                            arguments[2].asNumber(),
-                            arguments[3].asNumber()
-                    );
-                    // Return the newly constructed object
-                    return jsi::Object::createFromHostObject(
-                    runtime, std::make_shared<JsiSkRSXform>(std::move(context), std::move(rsxform)));
-            };
-        }
+namespace jsi = facebook::jsi;
+
+class JsiSkRSXform : public JsiSkWrappingSharedPtrHostObject<SkRSXform> {
+public:
+  JsiSkRSXform(std::shared_ptr<RNSkPlatformContext> context,
+               const SkRSXform &rsxform)
+      : JsiSkWrappingSharedPtrHostObject<SkRSXform>(
+            std::move(context), std::make_shared<SkRSXform>(rsxform)) {}
+
+  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
+
+  JSI_PROPERTY_GET(__typename__) {
+    return jsi::String::createFromUtf8(runtime, "RSXform");
+  }
+
+  JSI_PROPERTY_GET(scos) {
+    return jsi::Value(SkScalarToDouble(getObject()->fSCos));
+  }
+  JSI_PROPERTY_GET(ssin) {
+    return jsi::Value(SkScalarToDouble(getObject()->fSSin));
+  }
+  JSI_PROPERTY_GET(tx) {
+    return jsi::Value(SkScalarToDouble(getObject()->fTx));
+  }
+  JSI_PROPERTY_GET(ty) {
+    return jsi::Value(SkScalarToDouble(getObject()->fTy));
+  }
+
+  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkRSXform, __typename__),
+                              JSI_EXPORT_PROP_GET(JsiSkRSXform, scos),
+                              JSI_EXPORT_PROP_GET(JsiSkRSXform, ssin),
+                              JSI_EXPORT_PROP_GET(JsiSkRSXform, tx),
+                              JSI_EXPORT_PROP_GET(JsiSkRSXform, ty), )
+
+  /**
+  Returns the underlying object from a host object of this type
+ */
+  static std::shared_ptr<SkRSXform> fromValue(jsi::Runtime &runtime,
+                                              const jsi::Value &obj) {
+    const auto &object = obj.asObject(runtime);
+    if (object.isHostObject(runtime)) {
+      return object.asHostObject<JsiSkRSXform>(runtime)->getObject();
+    } else {
+      auto scos =
+          object.getArray(runtime).getValueAtIndex(runtime, 0).asNumber();
+      auto ssin =
+          object.getArray(runtime).getValueAtIndex(runtime, 1).asNumber();
+      auto tx = object.getArray(runtime).getValueAtIndex(runtime, 2).asNumber();
+      auto ty = object.getArray(runtime).getValueAtIndex(runtime, 3).asNumber();
+      return std::make_shared<SkRSXform>(SkRSXform::Make(scos, ssin, tx, ty));
+    }
+  }
+
+  /**
+  Returns the jsi object from a host object of this type
+ */
+  static jsi::Value toValue(jsi::Runtime &runtime,
+                            std::shared_ptr<RNSkPlatformContext> context,
+                            const SkRSXform &rsxform) {
+    return jsi::Object::createFromHostObject(
+        runtime, std::make_shared<JsiSkRSXform>(std::move(context), rsxform));
+  }
+
+  /**
+   * Creates the function for construction a new instance of the SkRSXform
+   * wrapper
+   * @param context platform context
+   * @return A function for creating a new host object wrapper for the SkRSXform
+   * class
+   */
+  static const jsi::HostFunctionType
+  createCtor(std::shared_ptr<RNSkPlatformContext> context) {
+    return JSI_HOST_FUNCTION_LAMBDA {
+      auto rsxform =
+          SkRSXform::Make(arguments[0].asNumber(), arguments[1].asNumber(),
+                          arguments[2].asNumber(), arguments[3].asNumber());
+      // Return the newly constructed object
+      return jsi::Object::createFromHostObject(
+          runtime, std::make_shared<JsiSkRSXform>(std::move(context),
+                                                  std::move(rsxform)));
     };
+  }
+};
 } // namespace RNSkia

package/cpp/api/JsiSkRect.h

@@ -16,7 +16,7 @@
 
 namespace RNSkia {
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 class JsiSkRect : public JsiSkWrappingSharedPtrHostObject<SkRect> {
 public:
@@ -58,18 +58,16 @@ public:
    */
   JsiSkRect(std::shared_ptr<RNSkPlatformContext> context, const SkRect &rect)
       : JsiSkWrappingSharedPtrHostObject<SkRect>(
-            std::move(context), std::make_shared<SkRect>(rect)){}
+            std::move(context), std::make_shared<SkRect>(rect)) {}
 
   /**
     Returns the underlying object from a host object of this type
    */
   static std::shared_ptr<SkRect> fromValue(jsi::Runtime &runtime,
                                            const jsi::Value &obj) {
-    const auto& object = obj.asObject(runtime);
+    const auto &object = obj.asObject(runtime);
     if (object.isHostObject(runtime)) {
-      return object
-              .asHostObject<JsiSkRect>(runtime)
-              ->getObject();
+      return object.asHostObject<JsiSkRect>(runtime)->getObject();
     } else {
       auto x = object.getProperty(runtime, "x").asNumber();
       auto y = object.getProperty(runtime, "y").asNumber();
@@ -90,9 +88,10 @@ public:
   }
   static jsi::Value toValue(jsi::Runtime &runtime,
                             std::shared_ptr<RNSkPlatformContext> context,
-                            SkRect&& rect) {
+                            SkRect &&rect) {
     return jsi::Object::createFromHostObject(
-        runtime, std::make_shared<JsiSkRect>(std::move(context), std::move(rect)));
+        runtime,
+        std::make_shared<JsiSkRect>(std::move(context), std::move(rect)));
   }
 
   /**
@@ -112,7 +111,8 @@ public:
 
       // Return the newly constructed object
       return jsi::Object::createFromHostObject(
-          runtime, std::make_shared<JsiSkRect>(std::move(context), std::move(rect)));
+          runtime,
+          std::make_shared<JsiSkRect>(std::move(context), std::move(rect)));
     };
   }
 };

package/cpp/api/JsiSkRuntimeEffect.h

@@ -6,8 +6,8 @@
 #include <vector>
 
 #include <JsiSkHostObjects.h>
-#include <JsiSkShader.h>
 #include <JsiSkMatrix.h>
+#include <JsiSkShader.h>
 
 #include <jsi/jsi.h>
 
@@ -18,205 +18,201 @@
 
 #pragma clang diagnostic pop
 
-namespace RNSkia
-{
-
-  using namespace facebook;
-
-  struct RuntimeEffectUniform
-  {
-    int columns;
-    int rows;
-    int slot; // the index into the uniforms array that this uniform begins.
-    bool isInteger;
-  };
-
-  class JsiSkRuntimeEffect
-      : public JsiSkWrappingSkPtrHostObject<SkRuntimeEffect>
-  {
-  public:
-
-    static sk_sp<SkRuntimeEffect> fromValue(jsi::Runtime &runtime, const jsi::Value &obj) {
-        const auto& object = obj.asObject(runtime);
-        return object.asHostObject<JsiSkRuntimeEffect>(runtime)->getObject();
+namespace RNSkia {
+
+namespace jsi = facebook::jsi;
+
+struct RuntimeEffectUniform {
+  int columns;
+  int rows;
+  int slot; // the index into the uniforms array that this uniform begins.
+  bool isInteger;
+};
+
+class JsiSkRuntimeEffect
+    : public JsiSkWrappingSkPtrHostObject<SkRuntimeEffect> {
+public:
+  static sk_sp<SkRuntimeEffect> fromValue(jsi::Runtime &runtime,
+                                          const jsi::Value &obj) {
+    const auto &object = obj.asObject(runtime);
+    return object.asHostObject<JsiSkRuntimeEffect>(runtime)->getObject();
+  }
+
+  JSI_HOST_FUNCTION(makeShader) {
+    auto uniforms = castUniforms(runtime, arguments[0]);
+
+    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);
+
+    return jsi::Object::createFromHostObject(
+        runtime,
+        std::make_shared<JsiSkShader>(getContext(), std::move(shader)));
+  }
+
+  JSI_HOST_FUNCTION(makeShaderWithChildren) {
+    auto uniforms = castUniforms(runtime, arguments[0]);
+
+    // Children
+    std::vector<sk_sp<SkShader>> children;
+    auto jsiChildren = arguments[1].asObject(runtime).asArray(runtime);
+    auto jsiChildCount = jsiChildren.size(runtime);
+    children.reserve(jsiChildCount);
+    for (int i = 0; i < jsiChildCount; i++) {
+      auto shader = jsiChildren.getValueAtIndex(runtime, i)
+                        .asObject(runtime)
+                        .asHostObject<JsiSkShader>(runtime)
+                        ->getObject();
+      children.push_back(shader);
     }
 
-    JSI_HOST_FUNCTION(makeShader)
-    {
-      auto uniforms = castUniforms(runtime, arguments[0]);
+    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), children.data(),
+                                          children.size(), matrix);
 
-      // Create and return shader as host object
-      auto shader = getObject()->makeShader(std::move(uniforms), nullptr, 0, matrix);
+    return jsi::Object::createFromHostObject(
+        runtime,
+        std::make_shared<JsiSkShader>(getContext(), std::move(shader)));
+  }
 
-      return jsi::Object::createFromHostObject(
-          runtime, std::make_shared<JsiSkShader>(getContext(), std::move(shader)));
-    }
-
-    JSI_HOST_FUNCTION(makeShaderWithChildren)
-    {
-      auto uniforms = castUniforms(runtime, arguments[0]);
-
-      // Children
-      std::vector<sk_sp<SkShader>> children;
-      auto jsiChildren = arguments[1].asObject(runtime).asArray(runtime);
-      auto jsiChildCount = jsiChildren.size(runtime);
-      children.reserve(jsiChildCount);
-      for (int i = 0; i < jsiChildCount; i++)
-      {
-        auto shader = jsiChildren.getValueAtIndex(runtime, i)
-                          .asObject(runtime)
-                          .asHostObject<JsiSkShader>(runtime)
-                          ->getObject();
-        children.push_back(shader);
-      }
+  JSI_HOST_FUNCTION(getUniformCount) {
+    return static_cast<int>(getObject()->uniforms().size());
+  }
 
-      auto matrix = count >= 3 && !arguments[2].isUndefined()  && !arguments[2].isNull() ? JsiSkMatrix::fromValue(runtime, arguments[2]).get() : nullptr;
+  JSI_HOST_FUNCTION(getUniformFloatCount) {
+    return static_cast<int>(getObject()->uniformSize() / sizeof(float));
+  }
 
-      // Create and return shader as host object
-      auto shader = getObject()->makeShader(std::move(uniforms), children.data(),
-                                            children.size(), matrix);
-
-      return jsi::Object::createFromHostObject(
-          runtime, std::make_shared<JsiSkShader>(getContext(), std::move(shader)));
+  JSI_HOST_FUNCTION(getUniformName) {
+    auto i = static_cast<int>(arguments[0].asNumber());
+    if (i < 0 || i >= getObject()->uniforms().size()) {
+      throw jsi::JSError(runtime, "invalid uniform index");
     }
-
-    JSI_HOST_FUNCTION(getUniformCount)
-    {
-      return static_cast<int>(getObject()->uniforms().size());
+    auto it = getObject()->uniforms().begin() + i;
+    return jsi::String::createFromAscii(runtime, it->name.c_str());
+  }
+
+  JSI_HOST_FUNCTION(getUniform) {
+    auto i = static_cast<int>(arguments[0].asNumber());
+    if (i < 0 || i >= getObject()->uniforms().size()) {
+      throw jsi::JSError(runtime, "invalid uniform index");
     }
-
-    JSI_HOST_FUNCTION(getUniformFloatCount)
-    {
-      return static_cast<int>(getObject()->uniformSize() / sizeof(float));
+    auto it = getObject()->uniforms().begin() + i;
+    auto result = jsi::Object(runtime);
+    RuntimeEffectUniform su = fromUniform(*it);
+    result.setProperty(runtime, "columns", su.columns);
+    result.setProperty(runtime, "rows", su.rows);
+    result.setProperty(runtime, "slot", su.slot);
+    result.setProperty(runtime, "isInteger", su.isInteger);
+    return result;
+  }
+
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRuntimeEffect, makeShader),
+                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect,
+                                       makeShaderWithChildren),
+                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniformCount),
+                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect,
+                                       getUniformFloatCount),
+                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniformName),
+                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniform))
+
+  JsiSkRuntimeEffect(std::shared_ptr<RNSkPlatformContext> context,
+                     sk_sp<SkRuntimeEffect> rt)
+      : JsiSkWrappingSkPtrHostObject<SkRuntimeEffect>(std::move(context),
+                                                      std::move(rt)) {}
+
+private:
+  sk_sp<SkData> castUniforms(jsi::Runtime &runtime, const jsi::Value &value) {
+    auto jsiUniforms = value.asObject(runtime).asArray(runtime);
+    auto jsiUniformsSize = jsiUniforms.size(runtime);
+
+    // verify size of input uniforms
+    if (jsiUniformsSize * sizeof(float) != getObject()->uniformSize()) {
+      std::string msg =
+          "Uniforms size differs from effect's uniform size. Received " +
+          std::to_string(jsiUniformsSize) + " expected " +
+          std::to_string(getObject()->uniformSize() / sizeof(float));
+      throw jsi::JSError(runtime, msg.c_str());
     }
 
-    JSI_HOST_FUNCTION(getUniformName)
-    {
-      auto i = static_cast<int>(arguments[0].asNumber());
-      if (i < 0 || i >= getObject()->uniforms().size()) {
-        throw jsi::JSError(runtime, "invalid uniform index");
-      }
-      auto it = getObject()->uniforms().begin() + i;
-      return jsi::String::createFromAscii(runtime, it->name.c_str());
-    }
+    auto uniforms = SkData::MakeUninitialized(getObject()->uniformSize());
 
-    JSI_HOST_FUNCTION(getUniform)
-    {
-      auto i = static_cast<int>(arguments[0].asNumber());
-      if (i < 0 || i >= getObject()->uniforms().size()) {
-        throw jsi::JSError(runtime, "invalid uniform index");
-      }
+    // Convert to skia uniforms
+    const auto &u = getObject()->uniforms();
+    for (std::size_t i = 0; i < u.size(); i++) {
       auto it = getObject()->uniforms().begin() + i;
-      auto result = jsi::Object(runtime);
-      RuntimeEffectUniform su = fromUniform(*it);
-      result.setProperty(runtime, "columns", su.columns);
-      result.setProperty(runtime, "rows", su.rows);
-      result.setProperty(runtime, "slot", su.slot);
-      result.setProperty(runtime, "isInteger", su.isInteger);
-      return result;
-    }
-
-    JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRuntimeEffect, makeShader),
-                         JSI_EXPORT_FUNC(JsiSkRuntimeEffect,
-                                         makeShaderWithChildren),
-                         JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniformCount),
-                         JSI_EXPORT_FUNC(JsiSkRuntimeEffect,
-                                         getUniformFloatCount),
-                         JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniformName),
-                         JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniform))
-
-    JsiSkRuntimeEffect(std::shared_ptr<RNSkPlatformContext> context,
-                       sk_sp<SkRuntimeEffect> rt)
-        : JsiSkWrappingSkPtrHostObject<SkRuntimeEffect>(std::move(context), std::move(rt)){}
-
-  private:
-    sk_sp<SkData> castUniforms(jsi::Runtime &runtime, const jsi::Value &value)
-    {
-      auto jsiUniforms = value.asObject(runtime).asArray(runtime);
-      auto jsiUniformsSize = jsiUniforms.size(runtime);
-
-      // verify size of input uniforms
-      if (jsiUniformsSize * sizeof(float) != getObject()->uniformSize())
-      {
-        std::string msg = "Uniforms size differs from effect's uniform size. Received " +
-                std::to_string(jsiUniformsSize) +
-                " expected " +
-                std::to_string(getObject()->uniformSize() / sizeof(float));
-        throw jsi::JSError(runtime, msg.c_str());
+      RuntimeEffectUniform reu = fromUniform(*it);
+      for (std::size_t j = 0; j < reu.columns * reu.rows; ++j) {
+        const std::size_t offset = reu.slot + j;
+        float fValue = jsiUniforms.getValueAtIndex(runtime, offset).asNumber();
+        int iValue = static_cast<int>(fValue);
+        auto value = reu.isInteger ? iValue : fValue;
+        memcpy(SkTAddOffset<void>(uniforms->writable_data(),
+                                  offset * sizeof(value)),
+               &value, sizeof(value));
       }
-
-      auto uniforms = SkData::MakeUninitialized(getObject()->uniformSize());
-
-      // Convert to skia uniforms
-      const auto& u = getObject()->uniforms();
-      for (std::size_t i = 0; i < u.size(); i++)
-      {
-        auto it = getObject()->uniforms().begin() + i;
-        RuntimeEffectUniform reu = fromUniform(*it);
-        for (std::size_t j = 0; j < reu.columns * reu.rows; ++j) {
-          const std::size_t offset = reu.slot + j;
-          float fValue = jsiUniforms.getValueAtIndex(runtime, offset).asNumber();
-          int iValue = static_cast<int>(fValue);
-          auto value = reu.isInteger ? iValue : fValue;
-          memcpy(SkTAddOffset<void>(uniforms->writable_data(), offset * sizeof(value)), &value, sizeof(value));
-        }
-      }
-      return uniforms;
     }
-
-    RuntimeEffectUniform fromUniform(const SkRuntimeEffect::Uniform &u)
-    {
-      RuntimeEffectUniform su;
-      su.rows = u.count; // arrayLength
-      su.columns = 1;
-      su.isInteger = false;
-      using Type = SkRuntimeEffect::Uniform::Type;
-      switch (u.type)
-      {
-      case Type::kFloat:
-        break;
-      case Type::kFloat2:
-        su.columns = 2;
-        break;
-      case Type::kFloat3:
-        su.columns = 3;
-        break;
-      case Type::kFloat4:
-        su.columns = 4;
-        break;
-      case Type::kFloat2x2:
-        su.columns = 2;
-        su.rows *= 2;
-        break;
-      case Type::kFloat3x3:
-        su.columns = 3;
-        su.rows *= 3;
-        break;
-      case Type::kFloat4x4:
-        su.columns = 4;
-        su.rows *= 4;
-        break;
-      case Type::kInt:
-        su.isInteger = true;
-        break;
-      case Type::kInt2:
-        su.columns = 2;
-        su.isInteger = true;
-        break;
-      case Type::kInt3:
-        su.columns = 3;
-        su.isInteger = true;
-        break;
-      case Type::kInt4:
-        su.columns = 4;
-        su.isInteger = true;
-        break;
-      }
-      su.slot = (int)(u.offset / sizeof(float));
-      return su;
+    return uniforms;
+  }
+
+  RuntimeEffectUniform fromUniform(const SkRuntimeEffect::Uniform &u) {
+    RuntimeEffectUniform su;
+    su.rows = u.count; // arrayLength
+    su.columns = 1;
+    su.isInteger = false;
+    using Type = SkRuntimeEffect::Uniform::Type;
+    switch (u.type) {
+    case Type::kFloat:
+      break;
+    case Type::kFloat2:
+      su.columns = 2;
+      break;
+    case Type::kFloat3:
+      su.columns = 3;
+      break;
+    case Type::kFloat4:
+      su.columns = 4;
+      break;
+    case Type::kFloat2x2:
+      su.columns = 2;
+      su.rows *= 2;
+      break;
+    case Type::kFloat3x3:
+      su.columns = 3;
+      su.rows *= 3;
+      break;
+    case Type::kFloat4x4:
+      su.columns = 4;
+      su.rows *= 4;
+      break;
+    case Type::kInt:
+      su.isInteger = true;
+      break;
+    case Type::kInt2:
+      su.columns = 2;
+      su.isInteger = true;
+      break;
+    case Type::kInt3:
+      su.columns = 3;
+      su.isInteger = true;
+      break;
+    case Type::kInt4:
+      su.columns = 4;
+      su.isInteger = true;
+      break;
     }
-
-  };
+    su.slot = static_cast<int>(u.offset / sizeof(float));
+    return su;
+  }
+};
 } // namespace RNSkia