Add more SKPicture APIs (#2883)

Adding a few new APIs to help with determining picture and drawable "size" as well as adding the `Playback` method to `SKPicture`. The playback method is different to draw in that draw results in a single "draw the picture" command, but playback effectively replicates what was done to create the picture. There is a small different to the latter in that the picture may optimize/combine commands as well as split commands to best fit into the picture's storage.
mono · Jun 3, 2024 · c629919 · c629919
1 parent bc19136
commit c629919
Show file tree

Hide file tree

Showing 6 changed files with 139 additions and 1 deletion.
diff --git a/binding/SkiaSharp/SKDrawable.cs b/binding/SkiaSharp/SKDrawable.cs
@@ -65,6 +65,9 @@ public SKRect Bounds {
 			}
 		}
 
+		public int ApproximateBytesUsed =>
+			(int)SkiaApi.sk_drawable_approximate_bytes_used (Handle);
+
 		public void Draw (SKCanvas canvas, in SKMatrix matrix)
 		{
 			fixed (SKMatrix* m = &matrix)

diff --git a/binding/SkiaSharp/SKPicture.cs b/binding/SkiaSharp/SKPicture.cs
@@ -26,6 +26,15 @@ public SKRect CullRect {
 			}
 		}
 
+		public int ApproximateBytesUsed =>
+			(int)SkiaApi.sk_picture_approximate_bytes_used (Handle);
+
+		public int ApproximateOperationCount =>
+			GetApproximateOperationCount (false);
+
+		public int GetApproximateOperationCount(bool includeNested) =>
+			SkiaApi.sk_picture_approximate_op_count (Handle, includeNested);
+
 		// Serialize
 
 		public SKData Serialize () =>
@@ -48,6 +57,16 @@ public void Serialize (SKWStream stream)
 			SkiaApi.sk_picture_serialize_to_stream (Handle, stream.Handle);
 		}
 
+		// Playback
+
+		public void Playback (SKCanvas canvas)
+		{
+			if (canvas is null)
+				throw new ArgumentNullException (nameof (canvas));
+
+			SkiaApi.sk_picture_playback (Handle, canvas.Handle);
+		}
+
 		// ToShader
 
 		public SKShader ToShader () =>

diff --git a/binding/SkiaSharp/SkiaApi.generated.cs b/binding/SkiaSharp/SkiaApi.generated.cs
@@ -3751,6 +3751,20 @@ internal static void sk_document_unref (sk_document_t document) =>
 
 		#region sk_drawable.h
 
+		// size_t sk_drawable_approximate_bytes_used(const sk_drawable_t* drawable)
+		#if !USE_DELEGATES
+		[DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)]
+		internal static extern /* size_t */ IntPtr sk_drawable_approximate_bytes_used (sk_drawable_t drawable);
+		#else
+		private partial class Delegates {
+			[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
+			internal delegate /* size_t */ IntPtr sk_drawable_approximate_bytes_used (sk_drawable_t drawable);
+		}
+		private static Delegates.sk_drawable_approximate_bytes_used sk_drawable_approximate_bytes_used_delegate;
+		internal static /* size_t */ IntPtr sk_drawable_approximate_bytes_used (sk_drawable_t drawable) =>
+			(sk_drawable_approximate_bytes_used_delegate ??= GetSymbol<Delegates.sk_drawable_approximate_bytes_used> ("sk_drawable_approximate_bytes_used")).Invoke (drawable);
+		#endif
+
 		// void sk_drawable_draw(sk_drawable_t*, sk_canvas_t*, const sk_matrix_t*)
 		#if !USE_DELEGATES
 		[DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)]
@@ -7937,6 +7951,34 @@ internal static void sk_path_effect_unref (sk_path_effect_t t) =>
 
 		#region sk_picture.h
 
+		// size_t sk_picture_approximate_bytes_used(const sk_picture_t* picture)
+		#if !USE_DELEGATES
+		[DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)]
+		internal static extern /* size_t */ IntPtr sk_picture_approximate_bytes_used (sk_picture_t picture);
+		#else
+		private partial class Delegates {
+			[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
+			internal delegate /* size_t */ IntPtr sk_picture_approximate_bytes_used (sk_picture_t picture);
+		}
+		private static Delegates.sk_picture_approximate_bytes_used sk_picture_approximate_bytes_used_delegate;
+		internal static /* size_t */ IntPtr sk_picture_approximate_bytes_used (sk_picture_t picture) =>
+			(sk_picture_approximate_bytes_used_delegate ??= GetSymbol<Delegates.sk_picture_approximate_bytes_used> ("sk_picture_approximate_bytes_used")).Invoke (picture);
+		#endif
+
+		// int sk_picture_approximate_op_count(const sk_picture_t* picture, bool nested)
+		#if !USE_DELEGATES
+		[DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)]
+		internal static extern Int32 sk_picture_approximate_op_count (sk_picture_t picture, [MarshalAs (UnmanagedType.I1)] bool nested);
+		#else
+		private partial class Delegates {
+			[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
+			internal delegate Int32 sk_picture_approximate_op_count (sk_picture_t picture, [MarshalAs (UnmanagedType.I1)] bool nested);
+		}
+		private static Delegates.sk_picture_approximate_op_count sk_picture_approximate_op_count_delegate;
+		internal static Int32 sk_picture_approximate_op_count (sk_picture_t picture, [MarshalAs (UnmanagedType.I1)] bool nested) =>
+			(sk_picture_approximate_op_count_delegate ??= GetSymbol<Delegates.sk_picture_approximate_op_count> ("sk_picture_approximate_op_count")).Invoke (picture, nested);
+		#endif
+
 		// sk_picture_t* sk_picture_deserialize_from_data(sk_data_t* data)
 		#if !USE_DELEGATES
 		[DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)]
@@ -8035,6 +8077,20 @@ internal static sk_shader_t sk_picture_make_shader (sk_picture_t src, SKShaderTi
 			(sk_picture_make_shader_delegate ??= GetSymbol<Delegates.sk_picture_make_shader> ("sk_picture_make_shader")).Invoke (src, tmx, tmy, mode, localMatrix, tile);
 		#endif
 
+		// void sk_picture_playback(const sk_picture_t* picture, sk_canvas_t* canvas)
+		#if !USE_DELEGATES
+		[DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)]
+		internal static extern void sk_picture_playback (sk_picture_t picture, sk_canvas_t canvas);
+		#else
+		private partial class Delegates {
+			[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
+			internal delegate void sk_picture_playback (sk_picture_t picture, sk_canvas_t canvas);
+		}
+		private static Delegates.sk_picture_playback sk_picture_playback_delegate;
+		internal static void sk_picture_playback (sk_picture_t picture, sk_canvas_t canvas) =>
+			(sk_picture_playback_delegate ??= GetSymbol<Delegates.sk_picture_playback> ("sk_picture_playback")).Invoke (picture, canvas);
+		#endif
+
 		// sk_canvas_t* sk_picture_recorder_begin_recording(sk_picture_recorder_t*, const sk_rect_t*)
 		#if !USE_DELEGATES
 		[DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)]

diff --git a/externals/skia b/externals/skia
diff --git a/tests/Tests/SkiaSharp/SKDrawableTest.cs b/tests/Tests/SkiaSharp/SKDrawableTest.cs
@@ -22,6 +22,16 @@ public void CanAccessBounds()
 			}
 		}
 
+		[SkippableFact]
+		public void CanAccessApproxBytes()
+		{
+			using (var drawable = new TestDrawable())
+			{
+				Assert.Equal(123, drawable.ApproximateBytesUsed);
+				Assert.Equal(1, drawable.ApproxBytesCount);
+			}
+		}
+
 		[Trait(Traits.FailingOn.Key, Traits.FailingOn.Values.macOS)] // Something with sk_sp<SkPicture> SkDrawable::onMakePictureSnapshot() is causing issues
 		[Trait(Traits.FailingOn.Key, Traits.FailingOn.Values.iOS)] // Something with sk_sp<SkPicture> SkDrawable::onMakePictureSnapshot() is causing issues
 		[Trait(Traits.FailingOn.Key, Traits.FailingOn.Values.MacCatalyst)] // Something with sk_sp<SkPicture> SkDrawable::onMakePictureSnapshot() is causing issues
@@ -95,6 +105,7 @@ class TestDrawable : SKDrawable
 		public int DrawFireCount;
 		public int BoundsFireCount;
 		public int SnapshotFireCount;
+		public int ApproxBytesCount;
 
 		protected override void OnDraw(SKCanvas canvas)
 		{
@@ -116,5 +127,12 @@ protected override SKPicture OnSnapshot()
 
 			return base.OnSnapshot();
 		}
+
+		protected override int OnGetApproximateBytesUsed ()
+		{
+			ApproxBytesCount++;
+
+			return 123;
+		}
 	}
 }
diff --git a/tests/Tests/SkiaSharp/SKPictureTest.cs b/tests/Tests/SkiaSharp/SKPictureTest.cs
@@ -67,5 +67,47 @@ public void CanDeserializeFromStream()
 
 			ValidateTestBitmap(bmp);
 		}
+
+		[SkippableFact]
+		public void CanPlayback()
+		{
+			using var picture = CreateTestPicture();
+
+			using var bmp = new SKBitmap(40, 40);
+			using var cnv = new SKCanvas(bmp);
+
+			picture.Playback(cnv);
+
+			ValidateTestBitmap(bmp);
+		}
+
+		[SkippableFact]
+		public void CanDrawPicture()
+		{
+			using var picture = CreateTestPicture();
+
+			using var bmp = new SKBitmap(40, 40);
+			using var cnv = new SKCanvas(bmp);
+
+			cnv.DrawPicture(picture);
+
+			ValidateTestBitmap(bmp);
+		}
+
+		[SkippableFact]
+		public void CanGetApproximateOperationCount()
+		{
+			using var picture = CreateTestPicture();
+
+			Assert.Equal(5, picture.ApproximateOperationCount);
+		}
+
+		[SkippableFact]
+		public void CanGetApproximateBytesUsed()
+		{
+			using var picture = CreateTestPicture();
+
+			Assert.Equal(648, picture.ApproximateBytesUsed);
+		}
 	}
 }
+1 −0		include/c/sk_drawable.h
+3 −0		include/c/sk_picture.h
+4 −0		src/c/sk_drawable.cpp
+12 −0		src/c/sk_picture.cpp