FPS counter in clocks (#495)

* FPS counter in clocks

* Restore vsync

samples/SkiaAndroidSample/src/main/java/org/jetbrains/skiko/sample/Clocks.kt

@@ -11,6 +11,8 @@ import kotlin.math.sin
 import kotlin.math.PI
 
 class Clocks(private val layer: SkiaLayer): SkikoView {
+    private val withFps = true
+    private val fpsCounter = FPSCounter()
     private val platformYOffset = if (hostOs == OS.Ios) 50f else 5f
     private var frame = 0
     private var xpos = 0.0
@@ -26,6 +28,7 @@ class Clocks(private val layer: SkiaLayer): SkikoView {
     private var inputText = ""
 
     override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) {
+        if (withFps) fpsCounter.tick()
         canvas.translate(xOffset.toFloat(), yOffset.toFloat())
         canvas.scale(scale.toFloat(), scale.toFloat())
         canvas.rotate(rotate.toFloat(), (width / 2).toFloat(), (height / 2).toFloat())
@@ -85,9 +88,11 @@ class Clocks(private val layer: SkiaLayer): SkikoView {
             }
         }
 
+        val maybeFps = if (withFps) " ${fpsCounter.average}FPS " else ""
+
         val renderInfo = ParagraphBuilder(style, fontCollection)
             .pushStyle(TextStyle().setColor(0xFF000000.toInt()))
-            .addText("Graphics API: ${layer.renderApi} ✿ﾟ ${currentSystemTheme}")
+            .addText("Graphics API: ${layer.renderApi} ✿ﾟ ${currentSystemTheme}${maybeFps}")
             .popStyle()
             .build()
         renderInfo.layout(Float.POSITIVE_INFINITY)

samples/SkiaMultiplatformSample/src/commonMain/kotlin/org/jetbrains/skiko/sample/Clocks.kt

@@ -9,9 +9,10 @@ import org.jetbrains.skiko.*
 import kotlin.math.cos
 import kotlin.math.sin
 import kotlin.math.PI
-import kotlin.math.pow
 
 class Clocks(private val layer: SkiaLayer): SkikoView {
+    private val withFps = true
+    private val fpsCounter = FPSCounter()
     private val platformYOffset = if (hostOs == OS.Ios) 50f else 5f
     private var frame = 0
     private var xpos = 0.0
@@ -27,6 +28,7 @@ class Clocks(private val layer: SkiaLayer): SkikoView {
     private var inputText = ""
 
     override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) {
+        if (withFps) fpsCounter.tick()
         canvas.translate(xOffset.toFloat(), yOffset.toFloat())
         canvas.scale(scale.toFloat(), scale.toFloat())
         canvas.rotate(rotate.toFloat(), (width / 2).toFloat(), (height / 2).toFloat())
@@ -86,9 +88,11 @@ class Clocks(private val layer: SkiaLayer): SkikoView {
             }
         }
 
+        val maybeFps = if (withFps) " ${fpsCounter.average}FPS " else ""
+
         val renderInfo = ParagraphBuilder(style, fontCollection)
             .pushStyle(TextStyle().setColor(0xFF000000.toInt()))
-            .addText("Graphics API: ${layer.renderApi} ✿ﾟ ${currentSystemTheme}")
+            .addText("Graphics API: ${layer.renderApi} ✿ﾟ ${currentSystemTheme}${maybeFps}")
             .popStyle()
             .build()
         renderInfo.layout(Float.POSITIVE_INFINITY)

skiko/src/commonMain/kotlin/org/jetbrains/skiko/FPSCounter.kt

@@ -3,8 +3,8 @@ package org.jetbrains.skiko
 import kotlin.math.roundToInt
 
 class FPSCounter(
-    private val periodSeconds: Double,
-    private val showLongFrames: Boolean,
+    private val periodSeconds: Double = 2.0,
+    private val showLongFrames: Boolean = false,
     private val getLongFrameMillis: () -> Double = {
         1.5 * 1000 / 60
     }
@@ -12,6 +12,9 @@ class FPSCounter(
     private val times = mutableListOf<Long>()
     private var lastLogTime = currentNanoTime()
     private var lastTime = currentNanoTime()
+    private var _average = 0
+    private var _min = 0
+    private var _max = 0
 
     fun tick() {
         val time = currentNanoTime()
@@ -25,16 +28,25 @@ class FPSCounter(
             println("$timestamp Long frame ${frameTime.nanosToMillis()} ms")
         }
 
-        if ((time - lastLogTime) > periodSeconds.secondsToNanos()) {
-            val average = (nanosPerSecond / times.average()).roundToInt()
-            val min = (nanosPerSecond / times.maxOrNull()!!).roundToInt()
-            val max = (nanosPerSecond / times.minOrNull()!!).roundToInt()
-            println("[$timestamp] FPS $average ($min-$max)")
+        if ((time - lastLogTime) > periodSeconds.secondsToNanos() && times.isNotEmpty()) {
+            _average = (nanosPerSecond / times.average()).roundToInt()
+            _min = (nanosPerSecond / times.maxOrNull()!!).roundToInt()
+            _max = (nanosPerSecond / times.minOrNull()!!).roundToInt()
             times.clear()
             lastLogTime = time
         }
     }
 
+    val average: Int
+        get() = _average
+
+    val min: Int
+        get() = _min
+
+    val max: Int
+        get() = _max
+
+
     private val nanosPerMillis = 1_000_000.0
     private val nanosPerSecond = 1_000_000_000.0
     private fun Long.nanosToMillis(): Double = this / nanosPerMillis

skiko/src/macosMain/kotlin/org/jetbrains/skiko/redrawer/MetalRedrawer.macos.kt

@@ -145,7 +145,6 @@ internal class MetalLayer : CAMetalLayer {
             this.backgroundColor =
                 CGColorCreate(CGColorSpaceCreateDeviceRGB(), it.addressOf(0))
         }
-        this.displaySyncEnabled = false
         skiaLayer.nsView.layer = this
         skiaLayer.nsView.wantsLayer = true
         this.contentsGravity = kCAGravityTopLeft;
@@ -158,6 +157,5 @@ internal class MetalLayer : CAMetalLayer {
     override fun drawInContext(ctx: CGContextRef?) {
         skiaLayer.update(getTimeNanos())
         contextHandler.draw()
-        super.drawInContext(ctx)
     }
 }