Continue VK JNI and WebGPU integration with Kotlin rendering module.

Author: v.andrusyshyn

gradle/libs.versions.toml

@@ -4,14 +4,14 @@ atomicfu = "0.29.0"
 coreKtx = "1.13.1"
 firebaseAnalyticsKtx = "22.5.0"
 firebaseCrashlyticsKtx = "19.4.4"
+jinput = "2.0.10"
 koin = "4.1.1"
 kotlinxBrowser = "0.14.0"
 kotlinxCoroutinesCore = "1.10.2"
 kotlinxDatetime = "0.7.1"
 kotlinxSerializationCore = "1.7.3"
 kotlinxSerializationJson = "1.6.3"
 ktorSerializationKotlinxJsonVersion = "3.0.0"
-protobuf = "3.25.3"
 kotlin = "2.2.10"
 jetbrainsKotlinJvm = "2.2.10"
 compose = "1.8.2"
@@ -25,6 +25,7 @@ junit = "1.3.0"
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicfu" }
+jinput = { module = "net.java.jinput:jinput", version.ref = "jinput" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesCore" }
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
@@ -46,7 +47,6 @@ ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negoti
 ktor-server-core = { module = "io.ktor:ktor-server-core", version.ref = "ktor" }
 ktor-server-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor" }
 ktor-server-tests = { module = "io.ktor:ktor-server-tests", version.ref = "ktor" }
-protobuf-kotlin = { module = "com.google.protobuf:protobuf-kotlin", version.ref = "protobuf" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

kanvas-math/src/commonMain/kotlin/com/cws/kanvas/math/Mat4.kt

@@ -149,37 +149,37 @@ fun Mat4(
     return m
 }
 
-fun Mat4.model(translation: Vec3, rx: Float, ry: Float, rz: Float, scalar: Vec3): Mat4 = stackPush {
+fun ModelMatrix(translation: Vec3, rx: Float, ry: Float, rz: Float, scalar: Vec3): Mat4 = stackPush {
     Mat4()
         .identity()
         .translate(translation)
         .rotate(rx, ry, rz, Vec3(1f, 1f, 1f))
         .scale(scalar)
 }
 
-fun Mat4.model(translation: Vec3, quaternion: Quaternion, scalar: Vec3): Mat4 = stackPush {
+fun ModelMatrix(translation: Vec3, quaternion: Quaternion, scalar: Vec3): Mat4 = stackPush {
     Mat4()
         .identity()
         .translate(translation)
         .rotate(quaternion)
         .scale(scalar)
 }
 
-fun Mat4.rigid(translation: Vec3, rx: Float, ry: Float, rz: Float): Mat4 = stackPush {
+fun RigidMatrix(translation: Vec3, rx: Float, ry: Float, rz: Float): Mat4 = stackPush {
     Mat4()
         .identity()
         .translate(translation)
         .rotate(rx, ry, rz, Vec3(1f, 1f, 1f))
 }
 
-fun Mat4.rigid(translation: Vec3, quaternion: Quaternion): Mat4 = stackPush {
+fun RigidMatrix(translation: Vec3, quaternion: Quaternion): Mat4 = stackPush {
     Mat4()
         .identity()
         .translate(translation)
         .rotate(quaternion)
 }
 
-fun Mat4.view(position: Vec3, front: Vec3, up: Vec3): Mat4 = stackPush {
+fun ViewMatrix(position: Vec3, front: Vec3, up: Vec3): Mat4 = stackPush {
     val right = cross(front, up).normalize()
     val f = -front
     val c = cross(right, front)
@@ -192,7 +192,7 @@ fun Mat4.view(position: Vec3, front: Vec3, up: Vec3): Mat4 = stackPush {
     return m.transpose().inverse()
 }
 
-fun Mat4.ortho(left: Float, right: Float, bottom: Float, top: Float, zNear: Float, zFar: Float): Mat4 = stackPush {
+fun OrthoMatrix(left: Float, right: Float, bottom: Float, top: Float, zNear: Float, zFar: Float): Mat4 = stackPush {
     Mat4(
         2.0f / (right - left), 0.0f, 0.0f, 0.0f,
         0.0f, 2.0f / (bottom - top), 0.0f, 0.0f,
@@ -201,7 +201,7 @@ fun Mat4.ortho(left: Float, right: Float, bottom: Float, top: Float, zNear: Floa
     )
 }
 
-fun Mat4.perspective(aspectRatio: Float, fov: Degree, zNear: Float, zFar: Float): Mat4 = stackPush {
+fun PerspectiveMatrix(aspectRatio: Float, fov: Degree, zNear: Float, zFar: Float): Mat4 = stackPush {
     val f = 1.0f / tan((fov * 0.5f).radians.value)
     Mat4(
         f / aspectRatio, 0.0f, 0.0f, 0.0f,
@@ -211,7 +211,7 @@ fun Mat4.perspective(aspectRatio: Float, fov: Degree, zNear: Float, zFar: Float)
     )
 }
 
-fun Mat4.normal(): Mat4 = stackPush {
+fun NormalMatrix(): Mat4 = stackPush {
     return Mat4()
         .identity()
         .inverse()

kanvas-math/src/commonMain/kotlin/com/cws/kanvas/math/Transform.kt

@@ -0,0 +1,9 @@
+package com.cws.kanvas.math
+
+data class Transform(
+    var position: Vec3 = Vec3(),
+    var rotation: Vec3 = Vec3(),
+    var scale: Vec3 = Vec3(),
+) {
+    fun toMat4(): Mat4 = ModelMatrix(position, rotation.x, rotation.y, rotation.z, scale)
+}

kanvas-rendering/src/commonMain/kotlin/com/cws/kanvas/rendering/backend/Attribute.kt

@@ -1,33 +1,16 @@
 package com.cws.kanvas.rendering.backend
 
-expect enum class BindingType {
-    UNIFORM_BUFFER,
-    STORAGE_BUFFER,
-    TEXTURE,
-    SAMPLER,
-}
-
-interface BindingResource
-
-data class Binding(
-    var type: BindingType,
-    var shaderStages: Int,
-    var set: Int,
-    var binding: Int,
-    var count: Int = 1,
-    var resource: BindingResource? = null
-)
-
-data class BindingLayoutInfo(
-    val name: String,
-    val bindings: List<Binding>,
-)
-
-expect class BindingLayoutHandle
+import com.cws.std.memory.INativeData
+import com.cws.std.memory.MemoryLayout
+import com.cws.std.memory.NativeBuffer
 
-expect class BindingLayout(renderContext: RenderContext, info: BindingLayoutInfo) : Resource<BindingLayoutHandle> {
-    val info: BindingLayoutInfo
+expect class BindingLayout(context: RenderContext, info: BindingInfo)
+    : Resource<BindingLayoutHandle, BindingInfo>, INativeData {
     override fun onCreate()
     override fun onDestroy()
-    fun update()
+    override fun setInfo()
+    override val buffer: NativeBuffer?
+    override fun sizeBytes(layout: MemoryLayout): Int
+    override fun pack(buffer: NativeBuffer)
+    override fun unpack(buffer: NativeBuffer): INativeData
 }

kanvas-rendering/src/commonMain/kotlin/com/cws/kanvas/rendering/backend/BindingLayout.kt

@@ -2,33 +2,10 @@ package com.cws.kanvas.rendering.backend
 
 import com.cws.std.memory.NativeBuffer
 
-expect enum class BufferUsage {
-    TRANSFER_SRC,
-    TRANSFER_DST,
-    UNIFORM_TEXEL,
-    STORAGE_TEXEL,
-    UNIFORM_BUFFER,
-    STORAGE_BUFFER,
-    INDEX_BUFFER,
-    VERTEX_BUFFER,
-    INDIRECT_BUFFER;
-
-    val value: Int
-};
-
-data class BufferInfo(
-    val usages: Int,
-    val size: Long,
-    val memoryType: MemoryType,
-)
-
-expect class BufferHandle
-
-expect open class Buffer(context: RenderContext, info: BufferInfo) : Resource<BufferHandle> {
+expect open class Buffer(context: RenderContext, info: BufferInfo) : Resource<BufferHandle, BufferInfo> {
     override fun onCreate()
     override fun onDestroy()
-
-    fun write(data: NativeBuffer, srcOffset: Int, destOffset: Int, size: Int)
-    fun read(data: NativeBuffer, srcOffset: Int, destOffset: Int, size: Int)
-    fun update()
-}
+    override fun setInfo()
+    fun write(frame: Int, data: NativeBuffer, srcOffset: Int, destOffset: Int, size: Int)
+    fun read(frame: Int, data: NativeBuffer, srcOffset: Int, destOffset: Int, size: Int)
+}

kanvas-rendering/src/commonMain/kotlin/com/cws/kanvas/rendering/backend/Blend.kt

@@ -1,5 +1,55 @@
 package com.cws.kanvas.rendering.backend
 
-expect class CommandBuffer(context: RenderContext) {
+import com.cws.std.memory.NativeDataList
 
+expect class CommandBuffer(
+    context: RenderContext,
+    handle: CommandBufferHandle,
+) {
+    var handle: CommandBufferHandle?
+
+    fun reset()
+
+    fun begin()
+    fun end()
+
+    fun beginRenderPass(renderTarget: RenderTargetHandle, colorAttachmentIndex: Int)
+    fun endRenderPass()
+
+    fun setPipeline(pipeline: RenderPipeline)
+    fun setViewport(
+        x: Float, y: Float,
+        width: Float, height: Float,
+        minDepth: Float, maxDepth: Float,
+    )
+    fun setScissor(
+        x: Int, y: Int,
+        width: Int, height: Int,
+    )
+
+    fun addSecondaryBuffer(secondaryBuffer: CommandBufferHandle)
+    fun addSecondaryBuffers(secondaryBuffers: NativeDataList<CommandBufferHandle>)
+
+    fun draw(vertices: Int, vertexOffset: Int, instances: Int, instanceOffset: Int)
+
+    fun drawIndexed(vertices: Int, vertexOffset: Int,
+                    indices: Int, indexOffset: Int,
+                    instances: Int, instanceOffset: Int)
+
+    fun drawIndexedIndirect(indirectBuffer: BufferHandle, offset: Int, drawCount: Int)
+
+    fun copyBufferToBuffer(srcBuffer: BufferHandle, dstBuffer: BufferHandle,
+                           srcOffset: Int, dstOffset: Int, size: Int)
+
+    fun copyBufferToImage(srcBuffer: BufferHandle, dstImage: TextureHandle,
+                          dstMipLevel: Int, dstWidth: Int, dstHeight: Int, dstDepth: Int)
+
+    fun copyImageToBuffer(srcImage: TextureHandle, dstBuffer: BufferHandle,
+                          srcX: Int, srcY: Int, srcZ: Int, dstOffset: Int,
+                          width: Int, height: Int, depth: Int)
+
+    fun copyImageToImage(srcImage: TextureHandle, dstImage: TextureHandle,
+                         srcX: Int, srcY: Int, srcZ: Int,
+                         dstX: Int, dstY: Int, dstZ: Int,
+                         width: Int, height: Int, depth: Int)
 }