build: add examples as subproject

Author: silenium-dev

examples/settings.gradle.kts

@@ -7,10 +7,17 @@ plugins {
 
 val composeGlVersion = "2e851b0-dev"
 
+val useParent: Boolean = project.ext.properties.getOrDefault("examples.use-parent", "false").toString().toBoolean()
+
 dependencies {
     implementation(compose.desktop.currentOs)
-    implementation("dev.silenium.compose.gl:compose-gl:${composeGlVersion}")
-    implementation("dev.silenium.compose.gl:compose-gl-natives-all:${composeGlVersion}")
+    if (useParent) {
+        implementation(project(":"))
+    } else {
+        implementation("dev.silenium.compose.gl:compose-gl:${composeGlVersion}")
+        implementation("dev.silenium.compose.gl:compose-gl-natives-all:${composeGlVersion}")
+    }
+    implementation(libs.slf4j.api)
     runtimeOnly("ch.qos.logback:logback-classic:1.5.19")
 }
 

examples/skia-gl/build.gradle.kts

@@ -6,6 +6,7 @@ import androidx.compose.material.Button
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -18,8 +19,10 @@ import androidx.compose.ui.scene.PlatformLayersComposeScene
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import dev.silenium.compose.gl.LocalWindow
 import dev.silenium.compose.gl.canvas.GLCanvas
+import dev.silenium.compose.gl.canvas.Stats
+import dev.silenium.compose.gl.canvas.rememberGLCanvasState
+import dev.silenium.compose.gl.canvas.resetGLFeatures
 import dev.silenium.compose.gl.findSkiaLayer
 import dev.silenium.compose.gl.graphicsApi
 import org.jetbrains.skia.*
@@ -29,22 +32,27 @@ import org.jetbrains.skiko.Version
 fun main() = application {
     val glScene = PlatformLayersComposeScene()
     glScene.setContent {
-        Text(
-            "Hello from Skia on OpenGL",
-            style = MaterialTheme.typography.h2,
-            modifier = Modifier.background(Color.White.copy(alpha = 0.5f)).padding(10.dp),
-        )
+        Box(modifier = Modifier.wrapContentSize().background(Color.Red)) {
+            Box(modifier = Modifier.wrapContentSize().padding(50.dp).background(Color.Blue)) {
+                Text(
+                    "Hello from Skia on OpenGL",
+                    style = MaterialTheme.typography.h2,
+                    modifier = Modifier.background(Color.White.copy(alpha = 0.5f)).padding(10.dp),
+                )
+            }
+        }
     }
 
     var glSurface: Surface? by mutableStateOf(null)
     var glContext: DirectContext? by mutableStateOf(null)
     var glRenderTarget: BackendRenderTarget? by mutableStateOf(null)
 
     val renderer = SampleRenderer()
+    val state = rememberGLCanvasState()
     Window(onCloseRequest = ::exitApplication, title = "Test") {
         Box(Modifier.fillMaxSize()) {
-            println("skia layer: ${LocalWindow.current?.findSkiaLayer()}")
             GLCanvas(
+                state = state,
                 modifier = Modifier.fillMaxSize(),
                 onDispose = {
                     renderer.destroy()
@@ -74,15 +82,19 @@ fun main() = application {
                     )
                 },
             ) {
-                renderer.draw()
-                glContext?.resetGLAll()
+                glContext?.resetAll()
                 glSurface?.canvas?.let {
                     it.save()
                     it.translate(50f, 200f)
-                    glScene.render(it.asComposeCanvas(), 0L)
+                    glScene.render(it.asComposeCanvas(), System.nanoTime())
                     it.restore()
                 }
-                glSurface?.flushAndSubmit()
+                glSurface?.flushAndSubmit(true)
+                glContext?.flush()
+                glContext?.submit(true)
+                resetGLFeatures()
+                renderer.draw()
+                state.requestUpdate()
             }
             Surface(
                 shape = MaterialTheme.shapes.medium,
@@ -92,14 +104,28 @@ fun main() = application {
                 Column(
                     verticalArrangement = Arrangement.spacedBy(4.dp),
                     horizontalAlignment = Alignment.Start,
-                    modifier = Modifier.padding(8.dp),
+                    modifier = Modifier.padding(8.dp).width(300.dp),
                 ) {
                     Text("Skia Graphics API: ${window.findSkiaLayer()?.graphicsApi()}")
                     Text("Skia Version: ${Version.skia}")
                     Text("Skiko Version: ${Version.skiko}")
                     Button(onClick = { println("button pressed") }) {
                         Text("Button")
                     }
+
+                    val display by state.displayStatistics.collectAsState()
+                    Text("Display datapoints: ${display.frameTimes.values.size}")
+                    Text("Display frame time: ${display.frameTimes.median.inWholeMicroseconds / 1000.0} ms")
+                    Text("Display frame time (99th): ${display.frameTimes.percentile(0.99).inWholeMicroseconds / 1000.0} ms")
+                    Text("Display FPS: ${display.fps.median}")
+                    Text("Display FPS (99th): ${display.fps.percentile(0.99, Stats.Percentile.LOWEST)}")
+
+                    val render by state.renderStatistics.collectAsState()
+                    Text("Render datapoints: ${render.frameTimes.values.size}")
+                    Text("Render frame time: ${render.frameTimes.median.inWholeMicroseconds / 1000.0} ms")
+                    Text("Render frame time (99th): ${render.frameTimes.percentile(0.99).inWholeMicroseconds / 1000.0} ms")
+                    Text("Render FPS: ${render.fps.median} ms")
+                    Text("Render FPS (99th): ${render.fps.percentile(0.99, Stats.Percentile.LOWEST)}")
                 }
             }
         }

examples/skia-gl/src/main/kotlin/dev/silenium/compose/gl/examples/skia_gl/Main.kt

@@ -29,7 +29,7 @@ out vec4 color;
 uniform sampler2D myTextureSampler;
 
 void main() {
-    color = vec4(texture(myTextureSampler, UV).rgb, 1.0);
+    color = vec4(texture(myTextureSampler, UV).rgb, 0.7f);
     //color = vec4(UV.xy, 0.0, 1.0);
 }
 """
@@ -112,9 +112,6 @@ class SampleRenderer {
         glEnable(GL_BLEND)
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
 
-        glClearColor(0f, .8f, .4f, 1f)
-        glClear(GL_COLOR_BUFFER_BIT)
-
         glBindVertexArray(vao)
         glUseProgram(shaderProgram)
         glActiveTexture(GL_TEXTURE0)

examples/skia-gl/src/main/kotlin/dev/silenium/compose/gl/examples/skia_gl/SampleRenderer.kt

@@ -24,3 +24,4 @@ if (deployNative) {
 if (deployKotlin) {
     include(":native-all")
 }
+include(":examples", ":examples:skia-gl")