chore: Skia 3 Support

samples/Directory.Packages.props

@@ -17,10 +17,10 @@
     <PackageVersion Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.221109.1" />
-    <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.6" />
-    <PackageVersion Include="SkiaSharp.Views" Version="2.88.6" />
-    <PackageVersion Include="SkiaSharp.Views.Uno" Version="2.88.6" />
-    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
+    <PackageVersion Include="SkiaSharp.Skottie" Version="3.116.1" />
+    <PackageVersion Include="SkiaSharp.Views" Version="3.116.1" />
+    <PackageVersion Include="SkiaSharp.Views.Uno" Version="2.88.9" />
+    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="3.116.1" />
     <PackageVersion Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
     <PackageVersion Include="Uno.Cupertino" Version="5.3.0-dev.4" />

src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.Paint.cs

@@ -11,6 +11,7 @@
 using Uno.Extensions;
 using Uno.Logging;
 using Windows.UI;
+using Uno.Toolkit.Skia.WinUI;
 
 namespace Uno.Toolkit.UI;
 
@@ -207,7 +208,7 @@ public override void DrawDropShadow(ShadowPaintState state, SKCanvas canvas, SKP
 
 			paint.Style = SKPaintStyle.Fill;
 			paint.Color = shadow.GetSKColor();
-			paint.ImageFilter = SKImageFilter.CreateBlur(blurSigma, blurSigma);
+			paint.ImageFilter = SkiaCompat.SKImageFilter_CreateBlur(blurSigma, blurSigma);
 			paint.MaskFilter = null;
 			paint.StrokeWidth = 0;
 

src/Uno.Toolkit.Skia.WinUI/SkiaCompact.skia.cs

@@ -0,0 +1,314 @@
+#nullable enable
+
+using System;
+using System.Runtime.CompilerServices;
+using SkiaSharp;
+using static SkiaSharp.SKImageFilter;
+
+namespace Uno.Toolkit.Skia.WinUI;
+
+internal static class SkiaCompat
+{
+	private static readonly bool _isSkiaSharp3OrLater = typeof(SKPaint).Assembly.GetName().Version?.Major >= 3;
+
+	internal static SKImageFilter SKImageFilter_CreateBlur(float sigmaX, float sigmaY)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKImageFilter Legacy() => SKImageFilter.CreateBlur(sigmaX, sigmaY);
+			return Legacy();
+		}
+
+		return SKImageFilter_CreateBlur(null, sigmaX, sigmaY);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreateBlur")]
+	private static extern SKImageFilter SKImageFilter_CreateBlur(SKImageFilter? _, float sigmaX, float sigmaY);
+
+
+	internal static SKImageFilter SKImageFilter_CreateColorFilter(SKColorFilter cf, SKImageFilter? input, SKRect cropRect)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKImageFilter Legacy() => SKImageFilter.CreateColorFilter(cf, input, new SKImageFilter.CropRect(cropRect));
+			return Legacy();
+		}
+
+		return SKImageFilter_CreateColorFilter(null, cf, input, cropRect);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreateColorFilter")]
+	private static extern SKImageFilter SKImageFilter_CreateColorFilter(SKImageFilter? _, SKColorFilter cf, SKImageFilter? input, SKRect cropRect);
+
+	internal static SKImageFilter SKImageFilter_CreateColorFilter(SKColorFilter cf, SKImageFilter? input)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKImageFilter Legacy() => SKImageFilter.CreateColorFilter(cf, input);
+			return Legacy();
+		}
+
+		return SKImageFilter_CreateColorFilter(null, cf, input);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreateColorFilter")]
+	private static extern SKImageFilter SKImageFilter_CreateColorFilter(SKImageFilter? _, SKColorFilter cf, SKImageFilter? input);
+
+	internal static SKImageFilter SKImageFilter_CreateOffset(float dx, float dy, SKImageFilter? input, SKRect cropRect)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKImageFilter Legacy() => SKImageFilter.CreateOffset(dx, dy, input, new SKImageFilter.CropRect(cropRect));
+			return Legacy();
+		}
+
+		return SKImageFilter_CreateOffset(null, dx, dy, input, cropRect);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreateOffset")]
+	private static extern SKImageFilter SKImageFilter_CreateOffset(SKImageFilter? _, float radiusX, float radiusY, SKImageFilter? input, SKRect cropRect);
+
+	internal static SKRuntimeEffect SKRuntimeEffect_CreateShader(string sksl, out string errors)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKRuntimeEffect Legacy(out string errors) => SKRuntimeEffect.Create(sksl, out errors);
+			return Legacy(out errors);
+		}
+
+		return SKRuntimeEffect_CreateShader(null, sksl, out errors);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreateShader")]
+	private static extern SKRuntimeEffect SKRuntimeEffect_CreateShader(SKRuntimeEffect? _, string sksl, out string errors);
+
+	internal static void SKRuntimeEffectChildren_Add_WithNull(SKRuntimeEffectChildren @this, string name)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			void Legacy() => @this.Add(name, null);
+			Legacy();
+			return;
+		}
+
+		// TODO(Youssef,SkiaSharp3): Find a way to support this... Reflection?
+		throw new NotSupportedException("CompositionEffectBrush is not supported for SkiaSharp 3.");
+	}
+
+	internal static SKImageFilter SKImageFilter_CreateBlendMode(SKBlendMode mode, SKImageFilter? background, SKImageFilter? foreground, SKRect cropRect)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKImageFilter Legacy() => SKImageFilter.CreateBlendMode(mode, background, foreground, new SKImageFilter.CropRect(cropRect));
+			return Legacy();
+		}
+
+		return SKImageFilter_CreateBlendMode(null, mode, background, foreground, cropRect);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreateBlendMode")]
+	private static extern SKImageFilter SKImageFilter_CreateBlendMode(SKImageFilter? _, SKBlendMode mode, SKImageFilter? background, SKImageFilter? foreground, SKRect cropRect);
+
+	internal static SKImageFilter SKImageFilter_CreatePaint(SKPaint paint, SKRect cropRect)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKImageFilter Legacy() => SKImageFilter.CreatePaint(paint, new SKImageFilter.CropRect(cropRect));
+			return Legacy();
+		}
+
+		return SKImageFilter_CreatePaint(null, paint, cropRect);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreatePaint")]
+	private static extern SKImageFilter SKImageFilter_CreatePaint(SKImageFilter? _, SKPaint paint, SKRect cropRect);
+
+	internal static SKImageFilter SKImageFilter_CreateDropShadow(float dx, float dy, float sigmaX, float sigmaY, SKColor color)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKImageFilter Legacy() => SKImageFilter.CreateDropShadow(dx, dy, sigmaX, sigmaY, color);
+			return Legacy();
+		}
+
+		return SKImageFilter_CreateDropShadow(null, dx, dy, sigmaX, sigmaY, color);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreateDropShadow")]
+	private static extern SKImageFilter SKImageFilter_CreateDropShadow(SKImageFilter? _, float dx, float dy, float sigmaX, float sigmaY, SKColor color);
+
+	internal static SKImageFilter SKImageFilter_CreateArithmetic(float k1, float k2, float k3, float k4, bool enforcePMColor, SKImageFilter? background, SKImageFilter? foreground, SKRect cropRect)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKImageFilter Legacy() => SKImageFilter.CreateArithmetic(k1, k2, k3, k4, enforcePMColor, background, foreground, new SKImageFilter.CropRect(cropRect));
+			return Legacy();
+		}
+
+		return SKImageFilter_CreateArithmetic(null, k1, k2, k3, k4, enforcePMColor, background, foreground, cropRect);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreateArithmetic")]
+	private static extern SKImageFilter SKImageFilter_CreateArithmetic(SKImageFilter? _, float k1, float k2, float k3, float k4, bool enforcePMColor, SKImageFilter? background, SKImageFilter? foreground, SKRect cropRect);
+
+	internal static SKImageFilter SKImageFilter_CreateMerge(ReadOnlySpan<SKImageFilter> filters, SKRect cropRect)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKImageFilter Legacy(ReadOnlySpan<SKImageFilter> filters) => SKImageFilter.CreateMerge(filters.ToArray(), new SKImageFilter.CropRect(cropRect));
+			return Legacy(filters);
+		}
+
+		return SKImageFilter_CreateMerge(null, filters, cropRect);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreateMerge")]
+	private static extern SKImageFilter SKImageFilter_CreateMerge(SKImageFilter? _, ReadOnlySpan<SKImageFilter> filters, SKRect cropRect);
+
+	internal static SKImageFilter SKImageFilter_CreateMatrixConvolution(SKSizeI kernelSize, ReadOnlySpan<float> kernel, float gain, float bias, SKPointI kernelOffset, SKShaderTileMode tileMode, bool convolveAlpha, SKImageFilter? input, SKRect cropRect)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKImageFilter Legacy(ReadOnlySpan<float> kernel) => SKImageFilter.CreateMatrixConvolution(kernelSize, kernel.ToArray(), gain, bias, kernelOffset, tileMode, convolveAlpha, input, new SKImageFilter.CropRect(cropRect));
+			return Legacy(kernel);
+		}
+
+		return SKImageFilter_CreateMatrixConvolution(null, kernelSize, kernel, gain, bias, kernelOffset, tileMode, convolveAlpha, input, cropRect);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreateMatrixConvolution")]
+	private static extern SKImageFilter SKImageFilter_CreateMatrixConvolution(SKImageFilter? _, SKSizeI kernelSize, ReadOnlySpan<float> kernel, float gain, float bias, SKPointI kernelOffset, SKShaderTileMode tileMode, bool convolveAlpha, SKImageFilter? input, SKRect cropRect);
+
+	internal static SKImageFilter SKImageFilter_CreateDistantLitDiffuse(SKPoint3 direction, SKColor lightColor, float surfaceScale, float kd, SKImageFilter? input, SKRect cropRect)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKImageFilter Legacy() => SKImageFilter.CreateDistantLitDiffuse(direction, lightColor, surfaceScale, kd, input, new SKImageFilter.CropRect(cropRect));
+			return Legacy();
+		}
+
+		return SKImageFilter_CreateDistantLitDiffuse(null, direction, lightColor, surfaceScale, kd, input, cropRect);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreateDistantLitDiffuse")]
+	private static extern SKImageFilter SKImageFilter_CreateDistantLitDiffuse(SKImageFilter? _, SKPoint3 direction, SKColor lightColor, float surfaceScale, float kd, SKImageFilter? input, SKRect cropRect);
+
+	internal static SKImageFilter SKImageFilter_CreateDistantLitSpecular(SKPoint3 direction, SKColor lightColor, float surfaceScale, float ks, float shininess, SKImageFilter? input, SKRect cropRect)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKImageFilter Legacy() => SKImageFilter.CreateDistantLitSpecular(direction, lightColor, surfaceScale, ks, shininess, input, new SKImageFilter.CropRect(cropRect));
+			return Legacy();
+		}
+
+		return SKImageFilter_CreateDistantLitSpecular(null, direction, lightColor, surfaceScale, ks, shininess, input, cropRect);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreateDistantLitSpecular")]
+	private static extern SKImageFilter SKImageFilter_CreateDistantLitSpecular(SKImageFilter? _, SKPoint3 direction, SKColor lightColor, float surfaceScale, float ks, float shininess, SKImageFilter? input, SKRect cropRect);
+
+	internal static SKImageFilter SKImageFilter_CreateSpotLitDiffuse(SKPoint3 location, SKPoint3 target, float specularExponent, float cutoffAngle, SKColor lightColor, float surfaceScale, float kd, SKImageFilter? input, SKRect cropRect)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKImageFilter Legacy() => SKImageFilter.CreateSpotLitDiffuse(location, target, specularExponent, cutoffAngle, lightColor, surfaceScale, kd, input, new SKImageFilter.CropRect(cropRect));
+			return Legacy();
+		}
+
+		return SKImageFilter_CreateSpotLitDiffuse(null, location, target, specularExponent, cutoffAngle, lightColor, surfaceScale, kd, input, cropRect);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreateSpotLitDiffuse")]
+	private static extern SKImageFilter SKImageFilter_CreateSpotLitDiffuse(SKImageFilter? _, SKPoint3 location, SKPoint3 target, float specularExponent, float cutoffAngle, SKColor lightColor, float surfaceScale, float kd, SKImageFilter? input, SKRect cropRect);
+
+	internal static SKImageFilter SKImageFilter_CreateSpotLitSpecular(SKPoint3 location, SKPoint3 target, float specularExponent, float cutoffAngle, SKColor lightColor, float surfaceScale, float ks, float shininess, SKImageFilter? input, SKRect cropRect)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKImageFilter Legacy() => SKImageFilter.CreateSpotLitSpecular(location, target, specularExponent, cutoffAngle, lightColor, surfaceScale, ks, shininess, input, new SKImageFilter.CropRect(cropRect));
+			return Legacy();
+		}
+
+		return SKImageFilter_CreateSpotLitSpecular(null, location, target, specularExponent, cutoffAngle, lightColor, surfaceScale, ks, shininess, input, cropRect);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreateSpotLitSpecular")]
+	private static extern SKImageFilter SKImageFilter_CreateSpotLitSpecular(SKImageFilter? _, SKPoint3 location, SKPoint3 target, float specularExponent, float cutoffAngle, SKColor lightColor, float surfaceScale, float ks, float shininess, SKImageFilter? input, SKRect cropRect);
+
+	internal static SKImageFilter SKImageFilter_CreatePointLitDiffuse(SKPoint3 location, SKColor lightColor, float surfaceScale, float kd, SKImageFilter? input, SKRect cropRect)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKImageFilter Legacy() => SKImageFilter.CreatePointLitDiffuse(location, lightColor, surfaceScale, kd, input, new SKImageFilter.CropRect(cropRect));
+			return Legacy();
+		}
+
+		return SKImageFilter_CreatePointLitDiffuse(null, location, lightColor, surfaceScale, kd, input, cropRect);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreatePointLitDiffuse")]
+	private static extern SKImageFilter SKImageFilter_CreatePointLitDiffuse(SKImageFilter? _, SKPoint3 location, SKColor lightColor, float surfaceScale, float kd, SKImageFilter? input, SKRect cropRect);
+
+	internal static SKImageFilter SKImageFilter_CreatePointLitSpecular(SKPoint3 location, SKColor lightColor, float surfaceScale, float ks, float shininess, SKImageFilter? input, SKRect cropRect)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKImageFilter Legacy() => SKImageFilter.CreatePointLitSpecular(location, lightColor, surfaceScale, ks, shininess, input, new SKImageFilter.CropRect(cropRect));
+			return Legacy();
+		}
+
+		return SKImageFilter_CreatePointLitSpecular(null, location, lightColor, surfaceScale, ks, shininess, input, cropRect);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "CreatePointLitSpecular")]
+	private static extern SKImageFilter SKImageFilter_CreatePointLitSpecular(SKImageFilter? _, SKPoint3 location, SKColor lightColor, float surfaceScale, float ks, float shininess, SKImageFilter? input, SKRect cropRect);
+
+	internal static SKShader SKRuntimeEffect_ToShader(SKRuntimeEffect @this, bool isOpaque, SKRuntimeEffectUniforms uniforms)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			SKShader Legacy() => @this.ToShader(isOpaque, uniforms);
+			return Legacy();
+		}
+
+		// Note: No overload of ToShader in SkiaSharp 3 takes isOpaque parameter. So we ignore.
+		return SKRuntimeEffect_ToShader(@this, uniforms);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.Method, Name = "ToShader")]
+	private static extern SKShader SKRuntimeEffect_ToShader(SKRuntimeEffect @this, SKRuntimeEffectUniforms uniforms);
+
+	internal static ReadOnlySpan<byte> SKBitmap_GetPixelSpan(SKBitmap @this)
+	{
+		if (!_isSkiaSharp3OrLater)
+		{
+			[MethodImpl(MethodImplOptions.NoInlining)]
+			ReadOnlySpan<byte> Legacy() => @this.GetPixelSpan();
+			return Legacy();
+		}
+
+		return SKBitmap_GetPixelSpan_SkiaSharp(@this);
+	}
+
+	[UnsafeAccessor(UnsafeAccessorKind.Method, Name = "GetPixelSpan")]
+	private static extern Span<byte> SKBitmap_GetPixelSpan_SkiaSharp(SKBitmap @this);
+}