KHR_swapchain

Author: elect86

src/main/kotlin/vkk/_10/api/Device_vk10.kt

@@ -20,14 +20,6 @@ interface Device_vk10 : Pointer {
 
     val capabilities: CapabilitiesDevice
 
-    // --- [ vkAcquireNextImageKHR ] ---
-
-    fun MemoryStack.acquireNextImageKHR(swapchain: VkSwapchainKHR, timeout: Long = -1L, semaphore: VkSemaphore, fence: VkFence = VkFence.NULL, check: (VkResult) -> Unit = ::defaultCheck): Int =
-            framed { this.intAdr { check(nAcquireNextImageKHR(swapchain, timeout, semaphore, fence, it)) } }
-
-    fun acquireNextImageKHR(swapchain: VkSwapchainKHR, timeout: Long = -1L, semaphore: VkSemaphore, fence: VkFence = VkFence.NULL, check: (VkResult) -> Unit = ::defaultCheck): Int =
-            stak { it.acquireNextImageKHR(swapchain, timeout, semaphore, fence, check) }
-
     // --- [ vkAllocateDescriptorSets ] ---
 
     infix fun MemoryStack.allocateDescriptorSets(allocateInfo: DescriptorSetAllocateInfo): VkDescriptorSet_Array =
@@ -286,14 +278,6 @@ interface Device_vk10 : Pointer {
     infix fun createShaderModule(createInfo: ShaderModuleCreateInfo): VkShaderModule =
             stak { it createShaderModule createInfo }
 
-    // --- [ vkCreateSwapchainKHR ] ---
-
-    infix fun MemoryStack.createSwapchainKHR(createInfo: SwapchainCreateInfoKHR): VkSwapchainKHR =
-            framed { VkSwapchainKHR(this.longAdr { VK_CHECK_RESULT(callPPPPI(adr, createInfo write this, NULL, it, capabilities.vkCreateSwapchainKHR)) }) }
-
-    infix fun createSwapchainKHR(createInfo: SwapchainCreateInfoKHR): VkSwapchainKHR =
-            stak { it createSwapchainKHR createInfo }
-
     // --- [ vkDestroyBuffer ] ---
     infix fun destroy(buffer: VkBuffer) =
             callPJPV(adr, buffer.L, NULL, capabilities.vkDestroyBuffer)
@@ -370,10 +354,6 @@ interface Device_vk10 : Pointer {
     infix fun destroy(shaderModule: VkShaderModule) =
             callPJPV(adr, shaderModule.L, NULL, capabilities.vkDestroyShaderModule)
 
-    // --- [ vkDestroySwapchainKHR ] ---
-    infix fun destroy(swapchain: VkSwapchainKHR) =
-            callPJPV(adr, swapchain.L, NULL, capabilities.vkDestroySwapchainKHR)
-
     // --- [ vkDeviceWaitIdle ] ---
     fun waitIdle(): VkResult =
             VkResult(callPI(adr, capabilities.vkDeviceWaitIdle))
@@ -510,28 +490,6 @@ interface Device_vk10 : Pointer {
     fun getQueryPoolResults(queryPool: VkQueryPool, firstQuery: Int, queryCount: Int, dataSize: Int, pData: Ptr, stride: VkDeviceSize, flags: VkQueryResultFlags): VkResult =
             VkResult(callPJPPJI(adr, queryPool.L, firstQuery, queryCount, dataSize.L, pData, stride.L, flags, capabilities.vkGetQueryPoolResults))
 
-    // --- [ vkGetSwapchainImagesKHR ] ---
-
-    infix fun MemoryStack.getSwapchainImagesKHR(swapchain: VkSwapchainKHR): VkImage_Array =
-            framed {
-                var pSwapchainImages = LongPtr.NULL
-                val pSwapchainImageCount = this.mInt()
-                var swapchainImageCount: Int
-                var result: VkResult
-                do {
-                    result = nGetSwapchainImagesKHR(swapchain, pSwapchainImageCount.adr)
-                    swapchainImageCount = pSwapchainImageCount[0]
-                    if (result == VkResult.SUCCESS && swapchainImageCount != 0) {
-                        pSwapchainImages = this.mLong(swapchainImageCount)
-                        result = nGetSwapchainImagesKHR(swapchain, pSwapchainImageCount.adr, pSwapchainImages.adr)
-                    }
-                } while (result == VkResult.INCOMPLETE)
-                VkImage_Array(swapchainImageCount) { VkImage(pSwapchainImages[it]) }
-            }
-
-    infix fun getSwapchainImagesKHR(swapchain: VkSwapchainKHR): VkImage_Array =
-            stak { it getSwapchainImagesKHR swapchain }
-
     // --- [ vkInvalidateMappedMemoryRanges ] ---
 
     infix fun MemoryStack.invalidateMappedMemoryRanges(memoryRanges: Array<MappedMemoryRange>): VkResult =
@@ -638,9 +596,6 @@ interface Device_vk10 : Pointer {
             stak { it.waitForFences(fence, waitAll, timeout) }
 }
 
-inline fun Device_vk10.nAcquireNextImageKHR(swapchain: VkSwapchainKHR, timeout: Long = -1L, semaphore: VkSemaphore, fence: VkFence = VkFence.NULL, pImage: Ptr): VkResult =
-        VkResult(callPJJJJPI(adr, swapchain.L, timeout, semaphore.L, fence.L, pImage, capabilities.vkAcquireNextImageKHR))
-
 inline fun Device_vk10.nAllocateDescriptorSets(pAllocateInfo: Ptr, pDescriptorSets: Ptr): VkResult =
         VkResult(callPPPI(adr, pAllocateInfo, pDescriptorSets, capabilities.vkAllocateDescriptorSets))
 
@@ -698,9 +653,6 @@ inline fun Device_vk10.nGetImageSparseMemoryRequirements(image: VkImage, pSparse
 inline fun Device_vk10.nGetPipelineCacheData(pipelineCache: VkPipelineCache, pDataSize: IntPtr, pData: Ptr = NULL): VkResult =
         VkResult(callPJPPI(adr, pipelineCache.L, pDataSize.adr, pData, capabilities.vkGetPipelineCacheData))
 
-inline fun Device_vk10.nGetSwapchainImagesKHR(swapchain: VkSwapchainKHR, pSwapchainImageCount: Ptr, pSwapchainImages: Ptr = NULL): VkResult =
-        VkResult(callPJPPI(adr, swapchain.L, pSwapchainImageCount, pSwapchainImages, capabilities.vkGetSwapchainImagesKHR))
-
 inline fun Device_vk10.nInvalidateMappedMemoryRanges(memoryRangeCount: Int, pMemoryRanges: Ptr): VkResult =
         VkResult(callPPI(adr, memoryRangeCount, pMemoryRanges, capabilities.vkInvalidateMappedMemoryRanges))
 

src/main/kotlin/vkk/_10/api/Queue_vk10.kt

@@ -1,17 +1,17 @@
 package vkk._10.api
 
-import vkk.identifiers.CapabilitiesDevice
 import kool.adr
-import org.lwjgl.system.JNI.*
+import org.lwjgl.system.JNI.callPI
+import org.lwjgl.system.JNI.callPPJI
 import org.lwjgl.system.MemoryStack
 import org.lwjgl.system.Pointer
 import vkk.VkResult
 import vkk._10.structs.BindSparseInfo
 import vkk._10.structs.SubmitInfo
 import vkk._10.structs.write
 import vkk.entities.VkFence
-import vkk.extensions.PresentInfoKHR
 import vkk.framed
+import vkk.identifiers.CapabilitiesDevice
 import vkk.stak
 
 interface Queue_vk10 : Pointer {
@@ -26,14 +26,6 @@ interface Queue_vk10 : Pointer {
     fun bindSparse(bindInfos: Array<BindSparseInfo>, fence: VkFence = VkFence.NULL): VkResult =
             stak { it.bindSparse(bindInfos, fence) }
 
-    // --- [ vkQueuePresentKHR ] ---
-
-    infix fun MemoryStack.presentKHR(presentInfo: PresentInfoKHR): VkResult =
-            framed { presentInfo.native(this) { pPresentInfo -> VkResult(callPPI(adr, pPresentInfo, capabilities.vkQueuePresentKHR)).andCheck() } }
-
-    infix fun presentKHR(presentInfo: PresentInfoKHR): VkResult =
-            stak { it presentKHR presentInfo }
-
     // --- [ vkQueueSubmit ] ---
 
     fun MemoryStack.submit(submit: SubmitInfo, fence: VkFence = VkFence.NULL): VkResult =

src/main/kotlin/vkk/_10/structs/Offset2D.kt

@@ -1,6 +1,7 @@
 package vkk._10.structs
 
 import glm_.vec2.Vec2i
+import kool.IntPtr
 import kool.Ptr
 import org.lwjgl.vulkan.VkOffset2D.nx
 import org.lwjgl.vulkan.VkOffset2D.ny
@@ -29,6 +30,7 @@ class Offset2D(
 ) {
 
     constructor(v: Vec2i) : this(v.x, v.y)
+    constructor(ptr: IntPtr) : this(ptr[0], ptr[1])
 
     infix fun write(ptr: Ptr) {
         nx(ptr, x)

src/main/kotlin/vkk/_10/structs/Rect2D.kt

@@ -2,6 +2,8 @@ package vkk._10.structs
 
 import glm_.vec2.Vec2i
 import kool.Adr
+import kool.BytePtr
+import kool.IntPtr
 import kool.Ptr
 import org.lwjgl.system.MemoryStack
 import org.lwjgl.vulkan.VkRect2D.*
@@ -31,6 +33,8 @@ class Rect2D(
 
     constructor(size: Vec2i) : this(extent = Extent2D(size))
 
+    constructor(ptr: IntPtr) : this(Offset2D(ptr), Extent2D(ptr + 2))
+
     infix fun write(stack: MemoryStack): Adr =
         stack.ncalloc(ALIGNOF, 1, SIZEOF).also { write(it) }