vulkan dep

Author: elect86

build.gradle

@@ -31,15 +31,17 @@ apply plugin: 'com.github.johnrengelman.shadow'
 
 dependencies {
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
+    ext.kotlin = "org.jetbrains.kotlin:kotlin"
+    implementation "$kotlin-stdlib:$kotlinVersion"
+    implementation "$kotlin-reflect:$kotlinVersion"
 
-    implementation 'com.github.kotlin-graphics:gln:b6f92bf107aa87046bccb5d35edcccb50e767770'
+    ext.kx = "com.github.kotlin-graphics"
+    implementation "$kx:gln:b6f92bf107aa87046bccb5d35edcccb50e767770"
+    implementation "$kx:vkk:e3791981b95038abf8a4dd1296fbdd7dfaf93279"
 
     testImplementation 'io.kotlintest:kotlintest:2.0.7'
     testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.0.6'
 
-
 //    ext.jogl = "2.3.2"
 //    compile "org.jogamp.gluegen:gluegen-rt:$jogl"
 //    compile "org.jogamp.jogl:jogl-all:$jogl"
@@ -57,9 +59,10 @@ dependencies {
             ext.lwjglNatives = "natives-macos"
             break
     }
-    ["", "-glfw", "-jemalloc", "-openal", "-opengl", "-stb"].each {
+    ["", "-glfw", "-jemalloc", "-openal", "-opengl", "-stb", "-vulkan"].each {
         implementation "org.lwjgl:lwjgl$it:$lwjglVersion"
-        runtime "org.lwjgl:lwjgl$it:$lwjglVersion:$lwjglNatives"
+        if (it != "-vulkan")
+            runtime "org.lwjgl:lwjgl$it:$lwjglVersion:$lwjglNatives"
     }
 }
 

src/main/kotlin/uno/glfw/GlfwWindow.kt

@@ -14,6 +14,8 @@ import org.lwjgl.glfw.GLFW.*
 import org.lwjgl.system.MemoryUtil
 import org.lwjgl.system.MemoryUtil.memGetDouble
 import org.lwjgl.system.MemoryUtil.memGetInt
+import org.lwjgl.vulkan.VkInstance
+import vkk.appBuffer
 import java.nio.ByteBuffer
 import java.nio.FloatBuffer
 
@@ -306,10 +308,16 @@ class GlfwWindow(val handle: Long) {
 
     fun mouseButton(button: Int) = glfwGetMouseButton(handle, button)
 
+    fun getJoystickButtons(joystickId: Int): ByteBuffer? = glfwGetJoystickButtons(joystickId)
+    fun getJoystickAxes(joystickId: Int): FloatBuffer? = glfwGetJoystickAxes(joystickId)
+
     inline fun loop(block: () -> Unit) {
-        while (isOpen) block()
+        while (isOpen) {
+            glfwPollEvents()
+            block()
+            appBuffer.reset()
+        }
     }
 
-    fun getJoystickButtons(joystickId: Int): ByteBuffer? = glfwGetJoystickButtons(joystickId)
-    fun getJoystickAxes(joystickId: Int): FloatBuffer? = glfwGetJoystickAxes(joystickId)
+    infix fun createSurface(instance: VkInstance) = glfw.createWindowSurface(handle, instance)
 }

src/main/kotlin/uno/glfw/glfw.kt

@@ -1,27 +1,40 @@
 package uno.glfw
 
+import glm_.buffer.adr
 import glm_.vec2.Vec2i
 import org.lwjgl.glfw.GLFW.*
 import org.lwjgl.glfw.GLFWErrorCallback
+import org.lwjgl.glfw.GLFWVulkan
+import org.lwjgl.system.MemoryUtil
+import org.lwjgl.system.MemoryUtil.NULL
+import org.lwjgl.system.MemoryUtil.memGetLong
 import org.lwjgl.system.Platform
+import org.lwjgl.vulkan.VkInstance
+import vkk.VK_CHECK_RESULT
+import vkk.VkSurfaceKHR
+import vkk.adr
+import vkk.appBuffer
 
 /**
  * Created by elect on 22/04/17.
  */
 
 object glfw {
 
+    @Throws(RuntimeException::class)
     fun init() {
 
         GLFWErrorCallback.createPrint(System.err).set()
         if (!glfwInit())
-            throw IllegalStateException("Unable to initialize GLFW")
+            throw RuntimeException("Unable to initialize GLFW")
 
         /* This window hint is required to use OpenGL 3.1+ on macOS */
         if (Platform.get() == Platform.MACOSX)
             windowHint.forwardComp = true
     }
 
+    val vulkanSupported get() = GLFWVulkan.glfwVulkanSupported()
+
     fun <T> windowHint(block: windowHint.() -> T) = windowHint.block()
 
     val primaryMonitor get() = glfwGetPrimaryMonitor()
@@ -45,5 +58,24 @@ object glfw {
     }
 
     fun pollEvents() = glfwPollEvents()
+
+    val requiredInstanceExtensions: ArrayList<String>
+        get() {
+            val pCount = appBuffer.intBuffer
+            val ppNames = GLFWVulkan.nglfwGetRequiredInstanceExtensions(pCount.adr)
+            val a = GLFWVulkan.glfwGetRequiredInstanceExtensions()
+            val count = pCount[0]
+            val pNames = MemoryUtil.memPointerBufferSafe(ppNames, count) ?: return arrayListOf()
+            val res = ArrayList<String>(count)
+            for (i in 0 until count)
+                res += MemoryUtil.memASCII(pNames[i])
+            return res
+        }
+
+    fun createWindowSurface(windowHandle: Long, instance: VkInstance): VkSurfaceKHR {
+        val pSurface = appBuffer.long
+        VK_CHECK_RESULT(GLFWVulkan.nglfwCreateWindowSurface(instance.adr, windowHandle, NULL, pSurface))
+        return memGetLong(pSurface)
+    }
 }