SKMetalView

binding/Binding/SKSurface.cs

@@ -294,9 +294,9 @@ public static SKSurface Create (GRContext context, CoreAnimation.CAMetalLayer la
 
 		public static SKSurface Create (GRContext context, CoreAnimation.CAMetalLayer layer, GRSurfaceOrigin origin, int sampleCount, SKColorType colorType, SKColorSpace colorspace, SKSurfaceProperties props, out CoreAnimation.ICAMetalDrawable drawable)
 		{
-			IntPtr drawablePtr;
-			var surface = GetObject (SkiaApi.sk_surface_new_metal_layer (context.Handle, layer.Handle, origin, sampleCount, colorType, colorspace?.Handle ?? IntPtr.Zero, props?.Handle ?? IntPtr.Zero, &drawablePtr));
-			drawable = ObjCRuntime.Runtime.GetINativeObject<CoreAnimation.ICAMetalDrawable> (drawablePtr, true);
+			void* drawablePtr;
+			var surface = GetObject (SkiaApi.sk_surface_new_metal_layer (context.Handle, (void*)layer.Handle, origin, sampleCount, colorType.ToNative (), colorspace?.Handle ?? IntPtr.Zero, props?.Handle ?? IntPtr.Zero, &drawablePtr));
+			drawable = ObjCRuntime.Runtime.GetINativeObject<CoreAnimation.ICAMetalDrawable> ((IntPtr)drawablePtr, true);
 			return surface;
 		}
 

samples/Basic/iOS/SkiaSharpSample/Main.storyboard

@@ -20,8 +20,18 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" id="199" customClass="SKCanvasView" translatesAutoresizingMaskIntoConstraints="NO" fixedFrame="YES">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <autoresizingMask key="autoresizingMask" heightSizable="YES" widthSizable="YES"/>
+                            </view>
+                        </subviews>
                     </view>
                     <navigationItem title="SkiaSharp Sample" id="287" key="navigationItem"/>
+                    <connections>
+                        <outlet property="skiaView" destination="199" id="name-outlet-199"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
@@ -31,7 +41,7 @@
             <objects>
                 <navigationController id="216" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="218">
-                        <rect key="frame" x="0.0" y="20" width="375" height="50"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>

samples/Basic/iOS/SkiaSharpSample/ViewController.cs

@@ -1,111 +1,6 @@
 using System;
 using UIKit;
 
-using SkiaSharp;
-using SkiaSharp.Views.iOS;
-using Metal;
-using MetalKit;
-using CoreGraphics;
-
-namespace SkiaSharpSample
-{
-	public partial class ViewController : UIViewController, IMTKViewDelegate
-	{
-		protected ViewController(IntPtr handle)
-			: base(handle)
-		{
-		}
-
-		MTKView mtkView;
-		GRContext grContext;
-		IMTLDevice metalDevice;
-		IMTLCommandQueue metalQueue;
-
-		public override void LoadView()
-		{
-			View = new MTKView(UIScreen.MainScreen.Bounds, null);
-		}
-
-		public override void ViewDidLoad()
-		{
-			base.ViewDidLoad();
-
-			if (grContext == null)
-			{
-				metalDevice = MTLDevice.SystemDefault;
-				metalQueue = metalDevice.CreateCommandQueue();
-				grContext = GRContext.CreateMetal(metalDevice, metalQueue);
-			}
-
-			if (View == null || metalDevice == null)
-			{
-				Console.WriteLine("Metal is not supported on this device.");
-				return;
-			}
-
-			mtkView = (MTKView)View;
-			mtkView.BackgroundColor = UIColor.Black;
-			mtkView.ColorPixelFormat = MTLPixelFormat.BGRA8Unorm;
-			mtkView.DepthStencilPixelFormat = MTLPixelFormat.Depth32Float_Stencil8;
-			mtkView.SampleCount = 1;
-			mtkView.Device = metalDevice;
-			mtkView.Delegate = this;
-		}
-
-		public void DrawableSizeWillChange(MTKView view, CGSize size)
-		{
-		}
-
-		public void Draw(MTKView view)
-		{
-			if (grContext == null || view == null)
-				return;
-
-			var colorType = SKColorType.Bgra8888;
-			var origin = GRSurfaceOrigin.TopLeft;
-			var sampleCount = (int)mtkView.SampleCount;
-			var size = mtkView.DrawableSize;
-			var width = (int)size.Width;
-			var height = (int)size.Height;
-
-			var fbInfo = new GRMetalTextureInfo(mtkView.CurrentDrawable.Texture);
-
-			using (var backendRT = new GRBackendRenderTarget(width, height, 1, fbInfo))
-			using (var surface = SKSurface.Create(grContext, backendRT, origin, colorType))
-			{
-				if (surface == null)
-				{
-					Console.WriteLine("Unable to create SKSurface.");
-					return;
-				}
-
-				OnPaintSurface(mtkView, new SKPaintGLSurfaceEventArgs(surface, backendRT));
-
-				// Must flush *and* present for this to work!
-				surface.Flush();
-			}
-
-			var commandBuffer = metalQueue.CommandBuffer();
-			commandBuffer.PresentDrawable(view.CurrentDrawable);
-			commandBuffer.Commit();
-		}
-
-		private void OnPaintSurface(object sender, SKPaintGLSurfaceEventArgs e)
-		{
-			var canvas = e.Surface.Canvas;
-
-			canvas.Clear(SKColors.Red);
-			canvas.DrawRect(SKRect.Create(100, 400, 400, 100), new SKPaint { Color = SKColors.Violet });
-			canvas.DrawText("This is METAL! " + DateTime.Now.ToString("mm:ss.fff"), 50, 550, new SKPaint { TextSize = 50 });
-
-		}
-	}
-}
-
-/*
-using System;
-using UIKit;
-
 using SkiaSharp;
 using SkiaSharp.Views.iOS;
 
@@ -153,5 +48,3 @@ private void OnPaintSurface(object sender, SKPaintSurfaceEventArgs e)
 		}
 	}
 }
-
- */

samples/Basic/macOS/SkiaSharpSample/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.11</string>
+	<string>10.10</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleInfoDictionaryVersion</key>

source/SkiaSharp.Views/SkiaSharp.Views.Apple/SKMetalView.cs

@@ -0,0 +1,152 @@
+#if __IOS__ || __MACOS__
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using CoreGraphics;
+using Foundation;
+using Metal;
+using MetalKit;
+
+#if __IOS__
+namespace SkiaSharp.Views.iOS
+#elif __MACOS__
+namespace SkiaSharp.Views.Mac
+#endif
+{
+	[Register(nameof(SKMetalView))]
+	[DesignTimeVisible(true)]
+	public class SKMetalView : MTKView, IMTKViewDelegate, IComponent
+	{
+		// for IComponent
+#pragma warning disable 67
+		private event EventHandler DisposedInternal;
+#pragma warning restore 67
+		ISite IComponent.Site { get; set; }
+		event EventHandler IComponent.Disposed
+		{
+			add { DisposedInternal += value; }
+			remove { DisposedInternal -= value; }
+		}
+
+		private bool designMode;
+
+		private IMTLCommandQueue commandQueue;
+		private GRContext context;
+
+		// created in code
+		public SKMetalView()
+			: this(CGRect.Empty)
+		{
+			Initialize();
+		}
+
+		// created in code
+		public SKMetalView(CGRect frame)
+			: base(frame, null)
+		{
+			Initialize();
+		}
+
+		// created in code
+		public SKMetalView(CGRect frame, IMTLDevice device)
+			: base(frame, device)
+		{
+			Initialize();
+		}
+
+		// created via designer
+		public SKMetalView(IntPtr p)
+			: base(p)
+		{
+		}
+
+		// created via designer
+		public override void AwakeFromNib()
+		{
+			Initialize();
+		}
+
+		private void Initialize()
+		{
+			designMode = ((IComponent)this).Site?.DesignMode == true || !Extensions.IsValidEnvironment;
+
+			if (designMode)
+				return;
+
+			var device = MTLDevice.SystemDefault;
+			if (device == null)
+			{
+				Console.WriteLine("Metal is not supported on this device.");
+				return;
+			}
+
+			ColorPixelFormat = MTLPixelFormat.BGRA8Unorm;
+			DepthStencilPixelFormat = MTLPixelFormat.Depth32Float_Stencil8;
+			SampleCount = 1;
+			Device = device;
+			commandQueue = device.CreateCommandQueue();
+
+			// hook up the drawing 
+			Delegate = this;
+		}
+
+		public SKSize CanvasSize { get; private set; }
+
+		public GRContext GRContext => context;
+
+		void IMTKViewDelegate.DrawableSizeWillChange(MTKView view, CGSize size)
+		{
+			CanvasSize = size.ToSKSize();
+		}
+
+		void IMTKViewDelegate.Draw(MTKView view)
+		{
+			if (designMode)
+				return;
+
+			if (Device == null || commandQueue == null || CurrentDrawable?.Texture == null)
+				return;
+
+			CanvasSize = DrawableSize.ToSKSize();
+
+			if (CanvasSize.Width <= 0 || CanvasSize.Height <= 0)
+				return;
+
+			// create the contexts if not done already
+			context ??= GRContext.CreateMetal(Device, commandQueue);
+
+			const SKColorType colorType = SKColorType.Bgra8888;
+			const GRSurfaceOrigin surfaceOrigin = GRSurfaceOrigin.TopLeft;
+
+			// create the render target
+			var metalInfo = new GRMetalTextureInfo(CurrentDrawable.Texture);
+			using var renderTarget = new GRBackendRenderTarget((int)CanvasSize.Width, (int)CanvasSize.Height, (int)SampleCount, metalInfo);
+
+			// create the surface
+			using var surface = SKSurface.Create(context, renderTarget, surfaceOrigin, colorType);
+			using var canvas = surface.Canvas;
+
+			// start drawing
+			var e = new SKPaintMetalSurfaceEventArgs(surface, renderTarget, surfaceOrigin, colorType);
+			OnPaintSurface(e);
+
+			// flush the SkiaSharp contents
+			canvas.Flush();
+			surface.Flush();
+			context.Flush();
+
+			// present
+			using var commandBuffer = commandQueue.CommandBuffer();
+			commandBuffer.PresentDrawable(CurrentDrawable);
+			commandBuffer.Commit();
+		}
+
+		public event EventHandler<SKPaintMetalSurfaceEventArgs> PaintSurface;
+
+		protected virtual void OnPaintSurface(SKPaintMetalSurfaceEventArgs e)
+		{
+			PaintSurface?.Invoke(this, e);
+		}
+	}
+}
+#endif

source/SkiaSharp.Views/SkiaSharp.Views.Apple/SKPaintMetalSurfaceEventArgs.cs

@@ -0,0 +1,34 @@
+#if __IOS__ || __MACOS__
+using System;
+
+#if __IOS__
+namespace SkiaSharp.Views.iOS
+#elif __MACOS__
+namespace SkiaSharp.Views.Mac
+#endif
+{
+	public class SKPaintMetalSurfaceEventArgs : EventArgs
+	{
+		public SKPaintMetalSurfaceEventArgs(SKSurface surface, GRBackendRenderTarget renderTarget)
+			: this(surface, renderTarget, GRSurfaceOrigin.TopLeft, SKColorType.Rgba8888)
+		{
+		}
+
+		public SKPaintMetalSurfaceEventArgs(SKSurface surface, GRBackendRenderTarget renderTarget, GRSurfaceOrigin origin, SKColorType colorType)
+		{
+			Surface = surface;
+			BackendRenderTarget = renderTarget;
+			ColorType = colorType;
+			Origin = origin;
+		}
+
+		public SKSurface Surface { get; private set; }
+
+		public GRBackendRenderTarget BackendRenderTarget { get; private set; }
+
+		public SKColorType ColorType { get; private set; }
+
+		public GRSurfaceOrigin Origin { get; private set; }
+	}
+}
+#endif