diff --git a/binding/SkiaSharp/Definitions.cs b/binding/SkiaSharp/Definitions.cs index a9217f6fcf..501e4d7921 100644 --- a/binding/SkiaSharp/Definitions.cs +++ b/binding/SkiaSharp/Definitions.cs @@ -59,6 +59,7 @@ public enum SKColorType Bgr101010xXR = 21, Srgba8888 = 22, R8Unorm = 23, + Rgba10x6 = 24, } public static partial class SkiaExtensions @@ -106,6 +107,7 @@ public static int GetBytesPerPixel (this SKColorType colorType) => SKColorType.RgbaF16Clamped => 8, SKColorType.RgbaF16 => 8, SKColorType.Rgba16161616 => 8, + SKColorType.Rgba10x6 => 8, // 16 SKColorType.RgbaF32 => 16, // @@ -143,6 +145,7 @@ public static int GetBitShiftPerPixel (this SKColorType colorType) => SKColorType.RgbaF16Clamped => 3, SKColorType.RgbaF16 => 3, SKColorType.Rgba16161616 => 3, + SKColorType.Rgba10x6 => 3, // 4 SKColorType.RgbaF32 => 4, // @@ -177,6 +180,7 @@ public static SKAlphaType GetAlphaType (this SKColorType colorType, SKAlphaType case SKColorType.RgbaF16: case SKColorType.RgbaF32: case SKColorType.Rgba16161616: + case SKColorType.Rgba10x6: break; // opaque diff --git a/binding/SkiaSharp/EnumMappings.cs b/binding/SkiaSharp/EnumMappings.cs index 52f2654c21..ff23c9162c 100644 --- a/binding/SkiaSharp/EnumMappings.cs +++ b/binding/SkiaSharp/EnumMappings.cs @@ -62,6 +62,7 @@ internal static SKColorTypeNative ToNative (this SKColorType colorType) => SKColorType.Alpha16 => SKColorTypeNative.A16Unorm, SKColorType.Rg1616 => SKColorTypeNative.R16g16Unorm, SKColorType.Rgba16161616 => SKColorTypeNative.R16g16b16a16Unorm, + SKColorType.Rgba10x6 => SKColorTypeNative.Rgb10x6, SKColorType.Bgra1010102 => SKColorTypeNative.Bgra1010102, SKColorType.Bgr101010x => SKColorTypeNative.Bgr101010x, SKColorType.Bgr101010xXR => SKColorTypeNative.Bgr101010xXr, @@ -92,6 +93,7 @@ internal static SKColorType FromNative (this SKColorTypeNative colorType) => SKColorTypeNative.A16Unorm => SKColorType.Alpha16, SKColorTypeNative.R16g16Unorm => SKColorType.Rg1616, SKColorTypeNative.R16g16b16a16Unorm => SKColorType.Rgba16161616, + SKColorTypeNative.Rgba10x6 => SKColorType.Rgba10x6, SKColorTypeNative.Bgra1010102 => SKColorType.Bgra1010102, SKColorTypeNative.Bgr101010x => SKColorType.Bgr101010x, SKColorTypeNative.Bgr101010xXr => SKColorType.Bgr101010xXR, diff --git a/binding/SkiaSharp/GRDefinitions.cs b/binding/SkiaSharp/GRDefinitions.cs index ed6c3facb0..6eeed36020 100644 --- a/binding/SkiaSharp/GRDefinitions.cs +++ b/binding/SkiaSharp/GRDefinitions.cs @@ -153,6 +153,7 @@ public static uint ToGlSizedFormat (this SKColorType colorType) => SKColorType.Alpha16 => GRGlSizedFormat.R16, SKColorType.Rg1616 => GRGlSizedFormat.RG16, SKColorType.Rgba16161616 => GRGlSizedFormat.RGBA16, + SKColorType.Rgba10x6 => 0, SKColorType.RgF16 => GRGlSizedFormat.RG16F, SKColorType.Rg88 => GRGlSizedFormat.RG8, SKColorType.Rgb101010x => 0, diff --git a/binding/libSkiaSharp.json b/binding/libSkiaSharp.json index adeb369440..48e0c26191 100644 --- a/binding/libSkiaSharp.json +++ b/binding/libSkiaSharp.json @@ -341,7 +341,7 @@ } }, // internal types - "sk_time_datetime_t": { + "sk_document_pdf_datetime_t": { "cs": "SKTimeDateTimeInternal", "internal": true }, diff --git a/externals/skia b/externals/skia index 1342f89446..69aba75b25 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit 1342f8944692d4355de3287f6d14c3a954d6773c +Subproject commit 69aba75b2575c0d1f4f4ed8cc870cc9a01069aa9 diff --git a/scripts/VERSIONS.txt b/scripts/VERSIONS.txt index 1e715d9fa8..a61fe5996d 100644 --- a/scripts/VERSIONS.txt +++ b/scripts/VERSIONS.txt @@ -1,7 +1,7 @@ # dependencies mdoc release 5.8.9 harfbuzz release 8.3.1 -skia release m118 +skia release m119 xunit release 2.4.2 xunit.runner.console release 2.4.2 OpenTK release 3.1.0 @@ -23,18 +23,18 @@ ANGLE release chromium/6275 # this is related to the API versions, not the library versions # - milestone: the skia milestone determined by Google/Chromium # - increment: the C API version increment caused by new APIs (externals\skia\include\c\sk_types.h) -libSkiaSharp milestone 118 +libSkiaSharp milestone 119 libSkiaSharp increment 0 # native sonames # ..0 -libSkiaSharp soname 118.0.0 +libSkiaSharp soname 119.0.0 # 0.<60000 + major*100 + minor*10 + micro>.0 HarfBuzz soname 0.60831.0 # SkiaSharp.dll -SkiaSharp assembly 3.118.0.0 -SkiaSharp file 3.118.0.0 +SkiaSharp assembly 3.119.0.0 +SkiaSharp file 3.119.0.0 # HarfBuzzSharp.dll HarfBuzzSharp assembly 1.0.0.0 @@ -42,34 +42,34 @@ HarfBuzzSharp file 8.3.1 # nuget versions # SkiaSharp -SkiaSharp nuget 3.118.0 -SkiaSharp.NativeAssets.Linux nuget 3.118.0 -SkiaSharp.NativeAssets.Linux.NoDependencies nuget 3.118.0 -SkiaSharp.NativeAssets.NanoServer nuget 3.118.0 -SkiaSharp.NativeAssets.WebAssembly nuget 3.118.0 -SkiaSharp.NativeAssets.Android nuget 3.118.0 -SkiaSharp.NativeAssets.iOS nuget 3.118.0 -SkiaSharp.NativeAssets.MacCatalyst nuget 3.118.0 -SkiaSharp.NativeAssets.macOS nuget 3.118.0 -SkiaSharp.NativeAssets.Tizen nuget 3.118.0 -SkiaSharp.NativeAssets.tvOS nuget 3.118.0 -SkiaSharp.NativeAssets.Win32 nuget 3.118.0 -SkiaSharp.NativeAssets.WinUI nuget 3.118.0 -SkiaSharp.Views nuget 3.118.0 -SkiaSharp.Views.Desktop.Common nuget 3.118.0 -SkiaSharp.Views.Gtk3 nuget 3.118.0 -SkiaSharp.Views.WindowsForms nuget 3.118.0 -SkiaSharp.Views.WPF nuget 3.118.0 -SkiaSharp.Views.Uno.WinUI nuget 3.118.0 -SkiaSharp.Views.WinUI nuget 3.118.0 -SkiaSharp.Views.Maui.Core nuget 3.118.0 -SkiaSharp.Views.Maui.Controls nuget 3.118.0 -SkiaSharp.Views.Blazor nuget 3.118.0 -SkiaSharp.HarfBuzz nuget 3.118.0 -SkiaSharp.Skottie nuget 3.118.0 -SkiaSharp.SceneGraph nuget 3.118.0 -SkiaSharp.Resources nuget 3.118.0 -SkiaSharp.Vulkan.SharpVk nuget 3.118.0 +SkiaSharp nuget 3.119.0 +SkiaSharp.NativeAssets.Linux nuget 3.119.0 +SkiaSharp.NativeAssets.Linux.NoDependencies nuget 3.119.0 +SkiaSharp.NativeAssets.NanoServer nuget 3.119.0 +SkiaSharp.NativeAssets.WebAssembly nuget 3.119.0 +SkiaSharp.NativeAssets.Android nuget 3.119.0 +SkiaSharp.NativeAssets.iOS nuget 3.119.0 +SkiaSharp.NativeAssets.MacCatalyst nuget 3.119.0 +SkiaSharp.NativeAssets.macOS nuget 3.119.0 +SkiaSharp.NativeAssets.Tizen nuget 3.119.0 +SkiaSharp.NativeAssets.tvOS nuget 3.119.0 +SkiaSharp.NativeAssets.Win32 nuget 3.119.0 +SkiaSharp.NativeAssets.WinUI nuget 3.119.0 +SkiaSharp.Views nuget 3.119.0 +SkiaSharp.Views.Desktop.Common nuget 3.119.0 +SkiaSharp.Views.Gtk3 nuget 3.119.0 +SkiaSharp.Views.WindowsForms nuget 3.119.0 +SkiaSharp.Views.WPF nuget 3.119.0 +SkiaSharp.Views.Uno.WinUI nuget 3.119.0 +SkiaSharp.Views.WinUI nuget 3.119.0 +SkiaSharp.Views.Maui.Core nuget 3.119.0 +SkiaSharp.Views.Maui.Controls nuget 3.119.0 +SkiaSharp.Views.Blazor nuget 3.119.0 +SkiaSharp.HarfBuzz nuget 3.119.0 +SkiaSharp.Skottie nuget 3.119.0 +SkiaSharp.SceneGraph nuget 3.119.0 +SkiaSharp.Resources nuget 3.119.0 +SkiaSharp.Vulkan.SharpVk nuget 3.119.0 # HarfBuzzSharp HarfBuzzSharp nuget 8.3.1 HarfBuzzSharp.NativeAssets.Android nuget 8.3.1 diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 754b7dc087..017a1a8b41 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -1,6 +1,6 @@ variables: SKIASHARP_MAJOR_VERSION: 3 - SKIASHARP_VERSION: 3.118.0 + SKIASHARP_VERSION: 3.119.0 FEATURE_NAME_PREFIX: 'feature/' VERBOSITY: normal GIT_SHA: $(Build.SourceVersion)