up

Author: elect86

.idea/modules/vkk.main.iml

@@ -94,7 +94,7 @@ compileKotlin {
     }
     // As per https://stackoverflow.com/a/47669720
     // See also https://discuss.kotlinlang.org/t/kotlin-support-for-java-9-module-system/2499/9
-//    destinationDir = compileJava.destinationDir
+    destinationDir = compileJava.destinationDir
 }
 
 compileTestKotlin {
@@ -114,6 +114,8 @@ compileJava {
     }
 }
 
+jar { duplicatesStrategy = DuplicatesStrategy.EXCLUDE }
+
 shadowJar.archiveClassifier = 'all'
 
 test {

.idea/modules/vkk.test.iml

@@ -15,6 +15,8 @@ import vkk.*
 import vkk._10.structs.DebugReportCallbackCreateInfo
 import vkk.entities.VkDebugReportCallback
 import vkk.entities.VkSurfaceKHR
+import vkk.extensions.VkDebugReportFlagsEXT
+import vkk.extensions.VkDebugReportObjectTypeEXT
 import vkk.identifiers.CapabilitiesInstance
 
 interface Instance_vk10 : Pointer {

build.gradle

@@ -3,8 +3,8 @@ package vkk._10.structs
 import kool.Ptr
 import org.lwjgl.system.MemoryUtil.memUTF8
 import org.lwjgl.vulkan.*
-import vkk.VkDebugReportFlagsEXT
-import vkk.VkDebugReportObjectTypeEXT
+import vkk.extensions.VkDebugReportFlagsEXT
+import vkk.extensions.VkDebugReportObjectTypeEXT
 
 /**
  * Application-defined debug report callback function.

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

@@ -9,8 +9,8 @@ import org.lwjgl.vulkan.VkDebugReportCallbackCreateInfoEXT
 import org.lwjgl.vulkan.VkDebugReportCallbackCreateInfoEXT.*
 import org.lwjgl.vulkan.VkDebugReportCallbackEXT
 import org.lwjgl.vulkan.VkDebugReportCallbackEXTI
-import vkk.VkDebugReportFlagsEXT
 import vkk.VkStructureType
+import vkk.extensions.VkDebugReportFlagsEXT
 
 /**
  * Structure specifying parameters of a newly created debug report callback.

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

@@ -0,0 +1,19 @@
+package vkk.extensions
+
+//VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndirectCountAMD(
+//VkCommandBuffer                             commandBuffer,
+//VkBuffer                                    buffer,
+//VkDeviceSize                                offset,
+//VkBuffer                                    countBuffer,
+//VkDeviceSize                                countBufferOffset,
+//uint32_t                                    maxDrawCount,
+//uint32_t                                    stride);
+//
+//VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndexedIndirectCountAMD(
+//VkCommandBuffer                             commandBuffer,
+//VkBuffer                                    buffer,
+//VkDeviceSize                                offset,
+//VkBuffer                                    countBuffer,
+//VkDeviceSize                                countBufferOffset,
+//uint32_t                                    maxDrawCount,
+//uint32_t                                    stride);