Changes

cake/native-shared.cake

@@ -63,6 +63,10 @@ void GnNinja(DirectoryPath outDir, string target, string skiaArgs)
         skiaArgs += $" win_vc='{win_vc}' ";
     }
 
+    skiaArgs += 
+        $" skia_enable_tools=false " +
+        $" is_official_build={CONFIGURATION.ToLower() == "release"} ".ToLower();
+
     // generate native skia build files
     RunProcess(GN_EXE, new ProcessSettings {
         Arguments = $"gen out/{outDir} --script-executable={quote}{PYTHON_EXE}{quote} --args={quote}{skiaArgs.Replace("'", innerQuote)}{quote}",

native/android/build.cake

@@ -25,8 +25,6 @@ Task("libSkiaSharp")
         GnNinja($"android/{arch}", "SkiaSharp",
             $"target_cpu='{skiaArch}' " +
             $"target_os='android' " +
-            $"is_official_build=true " +
-            $"skia_enable_tools=false " +
             $"skia_use_icu=false " +
             $"skia_use_piex=true " +
             $"skia_use_sfntly=false " +

native/ios/build.cake

@@ -30,8 +30,6 @@ Task("libSkiaSharp")
         GnNinja($"ios/{arch}", "skia",
             $"target_cpu='{skiaArch}' " +
             $"target_os='ios' " +
-            $"is_official_build=false " +
-            $"skia_enable_tools=false " +
             $"skia_use_icu=false " +
             $"skia_use_metal=true " +
             $"skia_use_piex=true " +

native/linux/build.cake

@@ -43,9 +43,7 @@ Task("libSkiaSharp")
         GnNinja($"{VARIANT}/{arch}", "SkiaSharp",
             $"target_os='linux' " +
             $"target_cpu='{arch}' " +
-            $"is_official_build=true " +
             $"skia_enable_gpu={(SUPPORT_GPU ? "true" : "false")} " +
-            $"skia_enable_tools=false " +
             $"skia_use_icu=false " +
             $"skia_use_piex=true " +
             $"skia_use_sfntly=false " +
@@ -92,7 +90,6 @@ Task("libHarfBuzzSharp")
         GnNinja($"{VARIANT}/{arch}", "HarfBuzzSharp",
             $"target_os='linux' " +
             $"target_cpu='{arch}' " +
-            $"is_official_build=true " +
             $"visibility_hidden=false " +
             $"extra_asmflags=[] " +
             $"extra_cflags=[] " +

native/macos/build.cake

@@ -22,8 +22,6 @@ Task("libSkiaSharp")
         GnNinja($"macos/{arch}", "skia",
             $"target_os='mac' " +
             $"target_cpu='{skiaArch}' " +
-            $"is_official_build=true " +
-            $"skia_enable_tools=false " +
             $"skia_use_icu=false " +
             $"skia_use_metal=true " +
             $"skia_use_piex=true " +

native/tizen/build.cake

@@ -24,9 +24,7 @@ Task("libSkiaSharp")
         GnNinja($"tizen/{arch}", "skia",
            $"target_os='tizen' " +
            $"target_cpu='{skiaArch}' " +
-           $"is_official_build=true " +
            $"skia_enable_gpu=true " +
-           $"skia_enable_tools=false " +
            $"skia_use_icu=false " +
            $"skia_use_piex=true " +
            $"skia_use_sfntly=false " +

native/tvos/build.cake

@@ -26,8 +26,6 @@ Task("libSkiaSharp")
         GnNinja($"tvos/{arch}", "skia",
             $"target_os='tvos' " +
             $"target_cpu='{skiaArch}' " +
-            $"is_official_build=true " +
-            $"skia_enable_tools=false " +
             $"skia_use_icu=false " +
             $"skia_use_piex=true " +
             $"skia_use_sfntly=false " +

native/uwp/build.cake

@@ -24,9 +24,7 @@ Task("libSkiaSharp")
         GnNinja($"uwp/{arch}", "SkiaSharp",
             $"target_os='winrt' " +
             $"target_cpu='{skiaArch}' " +
-            $"is_official_build=true " +
             $"skia_enable_fontmgr_win_gdi=false " +
-            $"skia_enable_tools=false " +
             $"skia_use_icu=false " +
             $"skia_use_piex=true " +
             $"skia_use_sfntly=false " +

native/wasm/build.cake

@@ -20,7 +20,6 @@ Task("libSkiaSharp")
     GnNinja($"wasm", "SkiaSharp",
         $"target_os='linux' " +
         $"target_cpu='wasm' " +
-        $"is_official_build=true " +
         $"is_static_skiasharp=true " +
         $"skia_enable_ccpr=false " +
         $"skia_enable_fontmgr_custom_empty=false " +
@@ -29,7 +28,6 @@ Task("libSkiaSharp")
         (SUPPORT_GPU ? "skia_gl_standard='webgl'" : "") +
         $"skia_enable_nvpr=false " +
         $"skia_enable_pdf=false " +
-        $"skia_enable_tools=false " +
         $"skia_use_dng_sdk=false " +
         $"skia_use_egl=true " +
         $"skia_use_fontconfig=false " +

native/watchos/build.cake

@@ -28,9 +28,7 @@ Task("libSkiaSharp")
         GnNinja($"watchos/{arch}", "skia",
             $"target_os='watchos' " +
             $"target_cpu='{skiaArch}' " +
-            $"is_official_build=true " +
             $"skia_enable_gpu=false " +
-            $"skia_enable_tools=false " +
             $"skia_use_icu=false " +
             $"skia_use_piex=true " +
             $"skia_use_sfntly=false " +

native/windows/build.cake

@@ -29,9 +29,7 @@ Task("libSkiaSharp")
         GnNinja($"{VARIANT}/{arch}", "SkiaSharp",
             $"target_os='win'" +
             $"target_cpu='{skiaArch}' " +
-            $"is_official_build=true " +
             $"skia_enable_fontmgr_win_gdi=false " +
-            $"skia_enable_tools=false " +
             $"skia_use_dng_sdk=true " +
             $"skia_use_icu=false " +
             $"skia_use_piex=true " +

samples/Basic/iOS/SkiaSharpSample/ViewController.cs

@@ -52,11 +52,14 @@ public override void ViewDidLoad()
 			mtkView.Delegate = this;
 		}
 
+		public void DrawableSizeWillChange(MTKView view, CGSize size)
+		{
+		}
 
-		private SKSurface SkMtkViewToSurface(MTKView mtkView)
+		public void Draw(MTKView view)
 		{
-			if (mtkView?.CurrentDrawable?.Texture == null || grContext == null)
-				return null;
+			if (grContext == null || view == null)
+				return;
 
 			var colorType = SKColorType.Bgra8888;
 			var origin = GRSurfaceOrigin.TopLeft;
@@ -67,75 +70,34 @@ private SKSurface SkMtkViewToSurface(MTKView mtkView)
 
 			var fbInfo = new GRMetalTextureInfo(mtkView.CurrentDrawable.Texture);
 
-			if (sampleCount == 1)
+			using (var backendRT = new GRBackendRenderTarget(width, height, 1, fbInfo))
+			using (var surface = SKSurface.Create(grContext, backendRT, origin, colorType))
 			{
-				var backendRT = new GRBackendRenderTarget(width, height, 1, fbInfo);
-				return SKSurface.Create(grContext, backendRT, origin, colorType);
-			}
-			else
-			{
-				var backendTexture = new GRBackendTexture(width, height, false, fbInfo);
-				return SKSurface.Create(grContext, backendTexture, origin, sampleCount, colorType);
-			}
-		}
-
-		public void DrawableSizeWillChange(MTKView view, CGSize size)
-		{
-		}
+				if (surface == null)
+				{
+					Console.WriteLine("Unable to create SKSurface.");
+					return;
+				}
 
-		public void Draw(MTKView view)
-		{
-			if (grContext == null || view == null)
-				return;
-
-			//// Do as much as possible before creating surface.
-			//config_paint(&fPaint);
-			//float rotation = (float)(180 * 1e-9 * SkTime::GetNSecs());
+				OnPaintSurface(mtkView, new SKPaintGLSurfaceEventArgs(surface, backendRT));
 
-			// Create surface:
-			var surface = SkMtkViewToSurface(view);
-			if (surface == null)
-			{
-				Console.WriteLine("Unable to create SKSurface.");
-				return;
+				// Must flush *and* present for this to work!
+				surface.Flush();
 			}
 
-			//draw_example(surface.get(), fPaint, rotation);
-
-			// Must flush *and* present for this to work!
-			surface.Flush();
-			surface = null;
-
 			var commandBuffer = metalQueue.CommandBuffer();
 			commandBuffer.PresentDrawable(view.CurrentDrawable);
 			commandBuffer.Commit();
 		}
 
-		private void OnPaintSurface(object sender, SKPaintSurfaceEventArgs e)
+		private void OnPaintSurface(object sender, SKPaintGLSurfaceEventArgs e)
 		{
-			// the the canvas and properties
 			var canvas = e.Surface.Canvas;
 
-			// get the screen density for scaling
-			var scale = (float)mtkView.ContentScaleFactor;
+			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 });
 
-			// handle the device screen density
-			canvas.Scale(scale);
-
-			// make sure the canvas is blank
-			canvas.Clear(SKColors.White);
-
-			// draw some text
-			var paint = new SKPaint
-			{
-				Color = SKColors.Black,
-				IsAntialias = true,
-				Style = SKPaintStyle.Fill,
-				TextAlign = SKTextAlign.Center,
-				TextSize = 24
-			};
-			var coord = new SKPoint((float)mtkView.Bounds.Width / 2, ((float)mtkView.Bounds.Height + paint.TextSize) / 2);
-			canvas.DrawText("SkiaSharp", coord, paint);
 		}
 	}
 }