use wgpu4k and add Android basic rendering

.github/workflows/build.yml

@@ -26,10 +26,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Java JDK 21
+      - name: Setup Java JDK 22
         uses: actions/[email protected]
         with:
-          java-version: 21
+          java-version: 22
           distribution: adopt
       - name: Grant gradlew execution permissions
         run: chmod +x gradlew

.github/workflows/publish-release.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Java JDK 21
+      - name: Setup Java JDK 22
         uses: actions/[email protected]
         with:
-          java-version: 21
+          java-version: 22
           distribution: adopt
       - name: Grant gradlew execution permissions
         run: chmod +x gradlew

.github/workflows/publish-snapshot.yml

@@ -21,10 +21,10 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Java JDK 21
+      - name: Setup Java JDK 22
         uses: actions/[email protected]
         with:
-          java-version: 21
+          java-version: 22
           distribution: adopt
       - name: Grant gradlew execution permissions
         run: chmod +x gradlew

README.md

@@ -4,7 +4,7 @@
 [![build](https://github.com/littlektframework/littlekt/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/littlektframework/littlekt/actions/workflows/build.yml)
 [![Download](https://img.shields.io/maven-central/v/com.littlekt/core/0.10.1)](https://search.maven.org/artifact/com.littlekt/core/0.10.1/pom)
 
-Requires JDK 21+ in order to use due to the usage of the new Java FFM API.
+Requires JDK 22+ in order to use due to the usage of the new Java FFM API.
 
 **Currently, in development.**
 
@@ -36,13 +36,13 @@ repositories {
 kotlin {
     jvm {
         compilations.all {
-            kotlinOptions.jvmTarget = "21" // littlekt targets jvm 21 so we must target at least 21
+            kotlinOptions.jvmTarget = "22" // littlekt targets jvm 21 so we must target at least 21
         }
     }
 }
 
 val littleKtVersion = "0.10.1" // get the latest release at the top
-val kotlinCoroutinesVersion = "1.9.0-RC" // or whatever version you are using
+val kotlinCoroutinesVersion = "1.9.0" // or whatever version you are using
 
 sourceSets {
     val commonMain by getting {

build.gradle.kts

@@ -12,10 +12,6 @@ plugins {
 val littleKtVersion: String by project
 
 allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
     group = "com.littlekt"
     version = littleKtVersion
     extra["isReleaseVersion"] = !littleKtVersion.endsWith("SNAPSHOT")
@@ -24,3 +20,11 @@ allprojects {
 plugins.withType<YarnPlugin> {
     the<YarnRootExtension>().apply { yarnLockMismatchReport = YarnLockMismatchReport.WARNING }
 }
+
+// TODO: remove later
+configurations.all {
+    resolutionStrategy {
+        cacheChangingModulesFor(0, "seconds")
+        cacheDynamicVersionsFor(0, "minutes")
+    }
+}

core/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 
@@ -15,12 +17,11 @@ kotlin {
             env = System.getProperty("env")
         }
         systemProperty("env", env ?: "dev")
-        jvmArgs("--enable-preview")
     }
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "11"
-            compileJavaTaskProvider?.get()?.options?.compilerArgs?.add("--enable-preview")
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_22
         }
     }
     js(KotlinJsCompilerType.IR) {
@@ -37,6 +38,7 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
+                api(libs.wgpu4k)
                 implementation(libs.kotlinx.atomicfu)
                 implementation(libs.kotlinx.coroutines.core)
                 implementation(libs.kotlinx.serialization.json)
@@ -47,11 +49,13 @@ kotlin {
         //noinspection UseTomlInstead
         val jvmMain by getting {
             dependencies {
-                implementation(project(":wgpu-ffm"))
-                implementation(project(":wgpu-natives"))
 
                 implementation(libs.mp3.decoder)
 
+                // Helper to create surface
+                implementation(libs.rococoa)
+                implementation(libs.jnaPlatform)
+
                 implementation(libs.lwjgl.core)
                 implementation(libs.lwjgl.glfw)
                 implementation(libs.lwjgl.openal)
@@ -84,16 +88,18 @@ kotlin {
 
         all {
             languageSettings.apply {
-                progressiveMode = true
                 optIn("kotlin.contracts.ExperimentalContracts")
                 optIn("kotlin.time.ExperimentalTime")
             }
         }
 
-        targets.configureEach {
-            compilations.configureEach {
-                compilerOptions.configure { freeCompilerArgs.add("-Xexpect-actual-classes") }
-            }
-        }
+    }
+
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
+    compilerOptions {
+        // Fix warning, then turn this on
+        allWarningsAsErrors = false
+        progressiveMode = true
+        freeCompilerArgs.add("-Xexpect-actual-classes")
     }
 }

core/src/commonMain/kotlin/com/littlekt/ContextConfiguration.kt

@@ -8,12 +8,3 @@ abstract class ContextConfiguration {
     abstract val title: String
     open val loadInternalResources: Boolean = true
 }
-
-/** When requesting an adapter, what is the preferred power usage. */
-enum class PowerPreference {
-    /** Lower power adapter. */
-    LOW_POWER,
-
-    /** High power adapter. */
-    HIGH_POWER
-}

core/src/commonMain/kotlin/com/littlekt/Graphics.kt

@@ -2,7 +2,13 @@ package com.littlekt
 
 import com.littlekt.graphics.Cursor
 import com.littlekt.graphics.SystemCursor
-import com.littlekt.graphics.webgpu.*
+import io.ygdrasil.wgpu.Adapter
+import io.ygdrasil.wgpu.Device
+import io.ygdrasil.wgpu.PresentMode
+import io.ygdrasil.wgpu.TextureFormat
+import io.ygdrasil.wgpu.TextureUsage
+import io.ygdrasil.wgpu.CompositeAlphaMode
+import io.ygdrasil.wgpu.Surface
 
 /**
  * Contains graphic related properties and methods.
@@ -36,18 +42,15 @@ interface Graphics {
     /** @return the preferred [TextureFormat] of the underlying [surface]. */
     val preferredFormat: TextureFormat
 
-    /** @return the capability of the underlying [surface] */
-    val surfaceCapabilities: SurfaceCapabilities
-
     /**
      * Configures the underlying [surface], via [Surface.configure], which initializes the surface
      * for presentation.
      */
     fun configureSurface(
-        usage: TextureUsage = TextureUsage.RENDER_ATTACHMENT,
+        usage: Set<TextureUsage> = setOf(TextureUsage.renderAttachment),
         format: TextureFormat = preferredFormat,
-        presentMode: PresentMode = PresentMode.FIFO,
-        alphaMode: AlphaMode = surfaceCapabilities.alphaModes[0]
+        presentMode: PresentMode = PresentMode.fifo,
+        alphaMode: CompositeAlphaMode = surface.supportedAlphaMode.first()
     )
 
     /**

core/src/commonMain/kotlin/com/littlekt/file/ldtk/-LDtkLevelLoader.kt

@@ -8,7 +8,6 @@ import com.littlekt.graphics.g2d.TextureSlice
 import com.littlekt.graphics.g2d.tilemap.ldtk.*
 import com.littlekt.graphics.slice
 import com.littlekt.graphics.sliceWithBorderToTexture
-import com.littlekt.graphics.webgpu.TextureFormat
 import com.littlekt.log.Logger
 import com.littlekt.math.geom.Point
 
@@ -666,10 +665,7 @@ internal class LDtkLevelLoader(
                         .readPixmap()
                         .sliceWithBorderToTexture(
                             device = vfs.vfs.context.graphics.device,
-                            preferredFormat =
-                                if (vfs.vfs.context.graphics.preferredFormat.srgb)
-                                    TextureFormat.RGBA8_UNORM_SRGB
-                                else TextureFormat.RGBA8_UNORM,
+                            preferredFormat = vfs.vfs.context.graphics.preferredFormat,
                             sliceWidth = tilesetDef.tileGridSize,
                             sliceHeight = tilesetDef.tileGridSize,
                             border = sliceBorder

core/src/commonMain/kotlin/com/littlekt/file/vfs/VfsLoaders.kt

@@ -16,9 +16,9 @@ import com.littlekt.graphics.g2d.TextureSlice
 import com.littlekt.graphics.g2d.font.*
 import com.littlekt.graphics.g2d.tilemap.ldtk.LDtkWorld
 import com.littlekt.graphics.g2d.tilemap.tiled.TiledMap
-import com.littlekt.graphics.webgpu.TextureFormat
 import com.littlekt.math.MutableVec4i
 import com.littlekt.util.internal.unquote
+import io.ygdrasil.wgpu.TextureFormat
 import kotlin.math.max
 
 /**
@@ -308,9 +308,8 @@ expect suspend fun VfsFile.readPixmap(): Pixmap
  * @return the loaded texture
  */
 expect suspend fun VfsFile.readTexture(
-    preferredFormat: TextureFormat =
-        if (vfs.context.graphics.preferredFormat.srgb) TextureFormat.RGBA8_UNORM_SRGB
-        else TextureFormat.RGBA8_UNORM
+    preferredFormat: TextureFormat = vfs.context.graphics.preferredFormat
+
 ): Texture
 
 /**

core/src/commonMain/kotlin/com/littlekt/graphics/Color.kt

@@ -101,6 +101,7 @@ open class Color(r: Float, g: Float, b: Float, a: Float = 1f) : Vec4f(r, g, b, a
 
     /** @return a new [MutableColor] using the color values of this color. */
     fun toMutableColor(result: MutableColor = MutableColor()) = result.set(r, g, b, a)
+    fun toWebGPUColor() = io.ygdrasil.wgpu.Color(r.toDouble(), g.toDouble(), b.toDouble(), a.toDouble())
 
     companion object {
         val CLEAR = Color(0f, 0f, 0f, 0f)

core/src/commonMain/kotlin/com/littlekt/graphics/EmptyTexture.kt

@@ -1,12 +1,23 @@
 package com.littlekt.graphics
 
 import com.littlekt.graphics.Texture.Companion.nextId
-import com.littlekt.graphics.webgpu.*
+import io.ygdrasil.wgpu.Device
+import io.ygdrasil.wgpu.Sampler
+import io.ygdrasil.wgpu.SamplerDescriptor
+import io.ygdrasil.wgpu.Size3D
+import io.ygdrasil.wgpu.TextureDescriptor
+import io.ygdrasil.wgpu.TextureDimension
+import io.ygdrasil.wgpu.TextureFormat
+import io.ygdrasil.wgpu.TextureUsage
+import io.ygdrasil.wgpu.TextureView
+import io.ygdrasil.wgpu.TextureViewDescriptor
+
+import io.ygdrasil.wgpu.Texture as WebGPUTexture
 
 /**
  * A [Texture] that doesn't contain any underlying raw image data, but instead, is intended to be
  * used in a render pass as an output. By default, the [textureDescriptor] uses
- * `TextureUsage.TEXTURE or TextureUsage.RENDER_ATTACHMENT` as usage.
+ * `TextureUsage.textureBinding or TextureUsage.renderAttachment` as usage.
  *
  * @param device the device for underlying GPU buffers creation
  * @param preferredFormat the preferred [TextureFormat]
@@ -19,7 +30,7 @@ class EmptyTexture(val device: Device, preferredFormat: TextureFormat, width: In
      * The [Extent3D] size of the texture. Uses the initial width & height from the constructor and
      * a depth of `1`.
      */
-    override var size: Extent3D = Extent3D(width, height, 1)
+    override var size: Size3D = Size3D(width, height, 1)
         private set
 
     override var id: Int = nextId()
@@ -29,32 +40,29 @@ class EmptyTexture(val device: Device, preferredFormat: TextureFormat, width: In
     override var textureDescriptor: TextureDescriptor =
         TextureDescriptor(
             size,
-            1,
-            1,
-            TextureDimension.D2,
             preferredFormat,
-            TextureUsage.TEXTURE or TextureUsage.RENDER_ATTACHMENT
+            setOf(TextureUsage.textureBinding, TextureUsage.renderAttachment)
         )
         set(value) {
             field = value
             val textureToDestroy = gpuTexture
-            textureToDestroy.release()
+            textureToDestroy.close()
             gpuTexture = device.createTexture(field)
         }
 
     /** The current [WebGPUTexture]. Changing the value of this field WILL change [id]. */
     override var gpuTexture: WebGPUTexture = device.createTexture(textureDescriptor)
         set(value) {
             field = value
-            view.release()
+            view.close()
             view = field.createView(textureViewDescriptor)
         }
 
     /** The current [TextureViewDescriptor]. Changing the value of this field WILL change [id]. */
     override var textureViewDescriptor: TextureViewDescriptor? = null
         set(value) {
             field = value
-            view.release()
+            view.close()
             view = gpuTexture.createView(value)
         }
 
@@ -71,7 +79,7 @@ class EmptyTexture(val device: Device, preferredFormat: TextureFormat, width: In
     override var samplerDescriptor: SamplerDescriptor = SamplerDescriptor()
         set(value) {
             field = value
-            sampler.release()
+            sampler.close()
             sampler = device.createSampler(value)
         }
 
@@ -89,7 +97,7 @@ class EmptyTexture(val device: Device, preferredFormat: TextureFormat, width: In
      * creating a whole new one.
      */
     fun resize(width: Int, height: Int) {
-        size = Extent3D(width, height, 1)
+        size = Size3D(width, height, 1)
         textureDescriptor = textureDescriptor.copy(size = size)
     }