From a593ed45c49422b19e74b165a97bcd4a1245e2fd Mon Sep 17 00:00:00 2001 From: gbarbieri Date: Wed, 27 Feb 2019 11:18:06 +0100 Subject: [PATCH] v0.2.4 Lwjgl 3.2.2-3 Kotlin 1.3.21 Shadow 4.0.4 Gradle 5.2.1 with Shadow workaround --- ...d5ecff1637632c823e230ae5cf3b618051e40f.xml | 11 ++ ...8eb79758bf3475e8cf1a93f138b2a19aadd7a5.xml | 11 -- ...1bc0717a13de4ea9920355462eaed83ed45127.xml | 11 ++ ...cafbd4e1bda500291b19a8d0cb75374f97688c.xml | 11 -- ...3dfaf417b00a0b7fe5dd273bf10291ebfe45d0.xml | 11 -- ...4292e2e2091ab7dfab7bbb66c4775229168df7.xml | 11 ++ ...3cc3ec155986f2100fee03cc143cbd3dfd0d84.xml | 11 -- ...a3af41713dba2d271043311ae947b8a41a42a3.xml | 11 ++ ...etbrains_kotlin_kotlin_reflect_1_3_11.xml} | 6 +- ...jetbrains_kotlin_kotlin_stdlib_1_3_11.xml} | 6 +- ...ns_kotlin_kotlin_stdlib_common_1_3_11.xml} | 6 +- .../Gradle__org_lwjgl_lwjgl_3_2_1.xml | 11 ++ ...e__org_lwjgl_lwjgl_3_2_1_natives_linux.xml | 11 ++ ..._org_lwjgl_lwjgl_3_2_1_natives_windows.xml | 11 ++ ...Gradle__org_lwjgl_lwjgl_3_2_2_SNAPSHOT.xml | 11 -- ...jgl_lwjgl_3_2_2_SNAPSHOT_natives_linux.xml | 11 -- ...l_lwjgl_3_2_2_SNAPSHOT_natives_windows.xml | 11 -- .../Gradle__org_lwjgl_lwjgl_glfw_3_2_1.xml | 11 ++ ...g_lwjgl_lwjgl_glfw_3_2_1_natives_linux.xml | 11 ++ ...lwjgl_lwjgl_glfw_3_2_1_natives_windows.xml | 11 ++ ...e__org_lwjgl_lwjgl_glfw_3_2_2_SNAPSHOT.xml | 11 -- ...wjgl_glfw_3_2_2_SNAPSHOT_natives_linux.xml | 11 -- ...gl_glfw_3_2_2_SNAPSHOT_natives_windows.xml | 11 -- ...Gradle__org_lwjgl_lwjgl_jemalloc_3_2_1.xml | 11 ++ ...jgl_lwjgl_jemalloc_3_2_1_natives_linux.xml | 11 ++ ...l_lwjgl_jemalloc_3_2_1_natives_windows.xml | 11 ++ ...rg_lwjgl_lwjgl_jemalloc_3_2_2_SNAPSHOT.xml | 11 -- ..._jemalloc_3_2_2_SNAPSHOT_natives_linux.xml | 11 -- ...emalloc_3_2_2_SNAPSHOT_natives_windows.xml | 11 -- .../Gradle__org_lwjgl_lwjgl_openal_3_2_1.xml | 11 ++ ...lwjgl_lwjgl_openal_3_2_1_natives_linux.xml | 11 ++ ...jgl_lwjgl_openal_3_2_1_natives_windows.xml | 11 ++ ..._org_lwjgl_lwjgl_openal_3_2_2_SNAPSHOT.xml | 11 -- ...gl_openal_3_2_2_SNAPSHOT_natives_linux.xml | 11 -- ..._openal_3_2_2_SNAPSHOT_natives_windows.xml | 11 -- .../Gradle__org_lwjgl_lwjgl_opengl_3_2_1.xml | 11 ++ ...lwjgl_lwjgl_opengl_3_2_1_natives_linux.xml | 11 ++ ...jgl_lwjgl_opengl_3_2_1_natives_windows.xml | 11 ++ ..._org_lwjgl_lwjgl_opengl_3_2_2_SNAPSHOT.xml | 11 -- ...gl_opengl_3_2_2_SNAPSHOT_natives_linux.xml | 11 -- ..._opengl_3_2_2_SNAPSHOT_natives_windows.xml | 11 -- .../Gradle__org_lwjgl_lwjgl_stb_3_2_1.xml | 11 ++ ...rg_lwjgl_lwjgl_stb_3_2_1_natives_linux.xml | 11 ++ ..._lwjgl_lwjgl_stb_3_2_1_natives_windows.xml | 11 ++ ...le__org_lwjgl_lwjgl_stb_3_2_2_SNAPSHOT.xml | 11 -- ...lwjgl_stb_3_2_2_SNAPSHOT_natives_linux.xml | 11 -- ...jgl_stb_3_2_2_SNAPSHOT_natives_windows.xml | 11 -- .../Gradle__org_lwjgl_lwjgl_vulkan_3_2_1.xml | 11 ++ ..._org_lwjgl_lwjgl_vulkan_3_2_2_SNAPSHOT.xml | 11 -- .../vkk/extensionFunctions/commandBuffer.kt | 117 ++++++++++++++---- src/main/kotlin/vkk/vk.kt | 2 +- vkk.iml | 78 ++++++------ 52 files changed, 398 insertions(+), 323 deletions(-) create mode 100644 .idea/libraries/Gradle__com_github_kotlin_graphics_gli_42d5ecff1637632c823e230ae5cf3b618051e40f.xml delete mode 100644 .idea/libraries/Gradle__com_github_kotlin_graphics_gli_968eb79758bf3475e8cf1a93f138b2a19aadd7a5.xml create mode 100644 .idea/libraries/Gradle__com_github_kotlin_graphics_glm_glm_3c1bc0717a13de4ea9920355462eaed83ed45127.xml delete mode 100644 .idea/libraries/Gradle__com_github_kotlin_graphics_glm_glm_a1cafbd4e1bda500291b19a8d0cb75374f97688c.xml delete mode 100644 .idea/libraries/Gradle__com_github_kotlin_graphics_kool_7c3dfaf417b00a0b7fe5dd273bf10291ebfe45d0.xml create mode 100644 .idea/libraries/Gradle__com_github_kotlin_graphics_kool_8d4292e2e2091ab7dfab7bbb66c4775229168df7.xml delete mode 100644 .idea/libraries/Gradle__com_github_kotlin_graphics_kotlin_unsigned_0e3cc3ec155986f2100fee03cc143cbd3dfd0d84.xml create mode 100644 .idea/libraries/Gradle__com_github_kotlin_graphics_kotlin_unsigned_6ba3af41713dba2d271043311ae947b8a41a42a3.xml rename .idea/libraries/{Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_21.xml => Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_11.xml} (55%) rename .idea/libraries/{Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_21.xml => Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_11.xml} (56%) rename .idea/libraries/{Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_21.xml => Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_11.xml} (54%) create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_1.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_1_natives_linux.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_1_natives_windows.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_2_SNAPSHOT.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_2_SNAPSHOT_natives_linux.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_2_SNAPSHOT_natives_windows.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_1.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_1_natives_linux.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_1_natives_windows.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_2_SNAPSHOT.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_2_SNAPSHOT_natives_linux.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_2_SNAPSHOT_natives_windows.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_1.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_1_natives_linux.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_1_natives_windows.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_2_SNAPSHOT.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_2_SNAPSHOT_natives_linux.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_2_SNAPSHOT_natives_windows.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_1.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_1_natives_linux.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_1_natives_windows.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_2_SNAPSHOT.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_2_SNAPSHOT_natives_linux.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_2_SNAPSHOT_natives_windows.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_1.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_1_natives_linux.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_1_natives_windows.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_2_SNAPSHOT.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_2_SNAPSHOT_natives_linux.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_2_SNAPSHOT_natives_windows.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_1.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_1_natives_linux.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_1_natives_windows.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_2_SNAPSHOT.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_2_SNAPSHOT_natives_linux.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_2_SNAPSHOT_natives_windows.xml create mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_vulkan_3_2_1.xml delete mode 100644 .idea/libraries/Gradle__org_lwjgl_lwjgl_vulkan_3_2_2_SNAPSHOT.xml diff --git a/.idea/libraries/Gradle__com_github_kotlin_graphics_gli_42d5ecff1637632c823e230ae5cf3b618051e40f.xml b/.idea/libraries/Gradle__com_github_kotlin_graphics_gli_42d5ecff1637632c823e230ae5cf3b618051e40f.xml new file mode 100644 index 0000000..bbe1e03 --- /dev/null +++ b/.idea/libraries/Gradle__com_github_kotlin_graphics_gli_42d5ecff1637632c823e230ae5cf3b618051e40f.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_github_kotlin_graphics_gli_968eb79758bf3475e8cf1a93f138b2a19aadd7a5.xml b/.idea/libraries/Gradle__com_github_kotlin_graphics_gli_968eb79758bf3475e8cf1a93f138b2a19aadd7a5.xml deleted file mode 100644 index d7c64fb..0000000 --- a/.idea/libraries/Gradle__com_github_kotlin_graphics_gli_968eb79758bf3475e8cf1a93f138b2a19aadd7a5.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_github_kotlin_graphics_glm_glm_3c1bc0717a13de4ea9920355462eaed83ed45127.xml b/.idea/libraries/Gradle__com_github_kotlin_graphics_glm_glm_3c1bc0717a13de4ea9920355462eaed83ed45127.xml new file mode 100644 index 0000000..8289cc2 --- /dev/null +++ b/.idea/libraries/Gradle__com_github_kotlin_graphics_glm_glm_3c1bc0717a13de4ea9920355462eaed83ed45127.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_github_kotlin_graphics_glm_glm_a1cafbd4e1bda500291b19a8d0cb75374f97688c.xml b/.idea/libraries/Gradle__com_github_kotlin_graphics_glm_glm_a1cafbd4e1bda500291b19a8d0cb75374f97688c.xml deleted file mode 100644 index bbd81cd..0000000 --- a/.idea/libraries/Gradle__com_github_kotlin_graphics_glm_glm_a1cafbd4e1bda500291b19a8d0cb75374f97688c.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_github_kotlin_graphics_kool_7c3dfaf417b00a0b7fe5dd273bf10291ebfe45d0.xml b/.idea/libraries/Gradle__com_github_kotlin_graphics_kool_7c3dfaf417b00a0b7fe5dd273bf10291ebfe45d0.xml deleted file mode 100644 index 3ddacf6..0000000 --- a/.idea/libraries/Gradle__com_github_kotlin_graphics_kool_7c3dfaf417b00a0b7fe5dd273bf10291ebfe45d0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_github_kotlin_graphics_kool_8d4292e2e2091ab7dfab7bbb66c4775229168df7.xml b/.idea/libraries/Gradle__com_github_kotlin_graphics_kool_8d4292e2e2091ab7dfab7bbb66c4775229168df7.xml new file mode 100644 index 0000000..0361450 --- /dev/null +++ b/.idea/libraries/Gradle__com_github_kotlin_graphics_kool_8d4292e2e2091ab7dfab7bbb66c4775229168df7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_github_kotlin_graphics_kotlin_unsigned_0e3cc3ec155986f2100fee03cc143cbd3dfd0d84.xml b/.idea/libraries/Gradle__com_github_kotlin_graphics_kotlin_unsigned_0e3cc3ec155986f2100fee03cc143cbd3dfd0d84.xml deleted file mode 100644 index 2865771..0000000 --- a/.idea/libraries/Gradle__com_github_kotlin_graphics_kotlin_unsigned_0e3cc3ec155986f2100fee03cc143cbd3dfd0d84.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_github_kotlin_graphics_kotlin_unsigned_6ba3af41713dba2d271043311ae947b8a41a42a3.xml b/.idea/libraries/Gradle__com_github_kotlin_graphics_kotlin_unsigned_6ba3af41713dba2d271043311ae947b8a41a42a3.xml new file mode 100644 index 0000000..cd560d5 --- /dev/null +++ b/.idea/libraries/Gradle__com_github_kotlin_graphics_kotlin_unsigned_6ba3af41713dba2d271043311ae947b8a41a42a3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_21.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_11.xml similarity index 55% rename from .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_21.xml rename to .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_11.xml index 2a15142..b74167b 100644 --- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_21.xml +++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_11.xml @@ -1,11 +1,11 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_21.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_11.xml similarity index 56% rename from .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_21.xml rename to .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_11.xml index 2100742..635b39e 100644 --- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_21.xml +++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_11.xml @@ -1,11 +1,11 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_21.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_11.xml similarity index 54% rename from .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_21.xml rename to .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_11.xml index 70287d8..977b939 100644 --- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_21.xml +++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_11.xml @@ -1,11 +1,11 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_1.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_1.xml new file mode 100644 index 0000000..b92fa3e --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_1_natives_linux.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_1_natives_linux.xml new file mode 100644 index 0000000..69a947a --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_1_natives_linux.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_1_natives_windows.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_1_natives_windows.xml new file mode 100644 index 0000000..416d5fc --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_1_natives_windows.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_2_SNAPSHOT.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_2_SNAPSHOT.xml deleted file mode 100644 index b59a1c1..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_2_SNAPSHOT.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_2_SNAPSHOT_natives_linux.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_2_SNAPSHOT_natives_linux.xml deleted file mode 100644 index d5577ef..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_2_SNAPSHOT_natives_linux.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_2_SNAPSHOT_natives_windows.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_2_SNAPSHOT_natives_windows.xml deleted file mode 100644 index c4f2d55..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_2_SNAPSHOT_natives_windows.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_1.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_1.xml new file mode 100644 index 0000000..7bd2b2e --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_1_natives_linux.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_1_natives_linux.xml new file mode 100644 index 0000000..8b22860 --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_1_natives_linux.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_1_natives_windows.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_1_natives_windows.xml new file mode 100644 index 0000000..26e2bdd --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_1_natives_windows.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_2_SNAPSHOT.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_2_SNAPSHOT.xml deleted file mode 100644 index 3181600..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_2_SNAPSHOT.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_2_SNAPSHOT_natives_linux.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_2_SNAPSHOT_natives_linux.xml deleted file mode 100644 index 36114eb..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_2_SNAPSHOT_natives_linux.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_2_SNAPSHOT_natives_windows.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_2_SNAPSHOT_natives_windows.xml deleted file mode 100644 index a4d9673..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_2_SNAPSHOT_natives_windows.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_1.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_1.xml new file mode 100644 index 0000000..9975b80 --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_1_natives_linux.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_1_natives_linux.xml new file mode 100644 index 0000000..c00f8aa --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_1_natives_linux.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_1_natives_windows.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_1_natives_windows.xml new file mode 100644 index 0000000..e72e211 --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_1_natives_windows.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_2_SNAPSHOT.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_2_SNAPSHOT.xml deleted file mode 100644 index d472f68..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_2_SNAPSHOT.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_2_SNAPSHOT_natives_linux.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_2_SNAPSHOT_natives_linux.xml deleted file mode 100644 index e1911d4..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_2_SNAPSHOT_natives_linux.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_2_SNAPSHOT_natives_windows.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_2_SNAPSHOT_natives_windows.xml deleted file mode 100644 index a15f685..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_2_SNAPSHOT_natives_windows.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_1.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_1.xml new file mode 100644 index 0000000..27a5fd6 --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_1_natives_linux.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_1_natives_linux.xml new file mode 100644 index 0000000..d005c8c --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_1_natives_linux.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_1_natives_windows.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_1_natives_windows.xml new file mode 100644 index 0000000..c5eb967 --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_1_natives_windows.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_2_SNAPSHOT.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_2_SNAPSHOT.xml deleted file mode 100644 index 2029de5..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_2_SNAPSHOT.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_2_SNAPSHOT_natives_linux.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_2_SNAPSHOT_natives_linux.xml deleted file mode 100644 index 32fdb06..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_2_SNAPSHOT_natives_linux.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_2_SNAPSHOT_natives_windows.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_2_SNAPSHOT_natives_windows.xml deleted file mode 100644 index e73c2e0..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_2_SNAPSHOT_natives_windows.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_1.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_1.xml new file mode 100644 index 0000000..e379add --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_1_natives_linux.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_1_natives_linux.xml new file mode 100644 index 0000000..0d29cc1 --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_1_natives_linux.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_1_natives_windows.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_1_natives_windows.xml new file mode 100644 index 0000000..91d69a2 --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_1_natives_windows.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_2_SNAPSHOT.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_2_SNAPSHOT.xml deleted file mode 100644 index 761b3de..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_2_SNAPSHOT.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_2_SNAPSHOT_natives_linux.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_2_SNAPSHOT_natives_linux.xml deleted file mode 100644 index fc507cc..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_2_SNAPSHOT_natives_linux.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_2_SNAPSHOT_natives_windows.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_2_SNAPSHOT_natives_windows.xml deleted file mode 100644 index 006df2e..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_2_SNAPSHOT_natives_windows.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_1.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_1.xml new file mode 100644 index 0000000..6519699 --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_1_natives_linux.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_1_natives_linux.xml new file mode 100644 index 0000000..600641c --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_1_natives_linux.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_1_natives_windows.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_1_natives_windows.xml new file mode 100644 index 0000000..d6e7f8e --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_1_natives_windows.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_2_SNAPSHOT.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_2_SNAPSHOT.xml deleted file mode 100644 index 87e4519..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_2_SNAPSHOT.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_2_SNAPSHOT_natives_linux.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_2_SNAPSHOT_natives_linux.xml deleted file mode 100644 index e8a09c4..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_2_SNAPSHOT_natives_linux.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_2_SNAPSHOT_natives_windows.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_2_SNAPSHOT_natives_windows.xml deleted file mode 100644 index cf50100..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_2_SNAPSHOT_natives_windows.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_vulkan_3_2_1.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_vulkan_3_2_1.xml new file mode 100644 index 0000000..9ab13d7 --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_vulkan_3_2_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_vulkan_3_2_2_SNAPSHOT.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_vulkan_3_2_2_SNAPSHOT.xml deleted file mode 100644 index 571934e..0000000 --- a/.idea/libraries/Gradle__org_lwjgl_lwjgl_vulkan_3_2_2_SNAPSHOT.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/kotlin/vkk/extensionFunctions/commandBuffer.kt b/src/main/kotlin/vkk/extensionFunctions/commandBuffer.kt index f45ce29..85a8114 100644 --- a/src/main/kotlin/vkk/extensionFunctions/commandBuffer.kt +++ b/src/main/kotlin/vkk/extensionFunctions/commandBuffer.kt @@ -21,34 +21,65 @@ infix fun VkCommandBuffer.begin(beginInfo: VkCommandBufferBeginInfo) = fun VkCommandBuffer.begin(flags: VkCommandBufferUsageFlags = VkCommandBufferUsage.SIMULTANEOUS_USE_BIT.i) = begin(vk.CommandBufferBeginInfo { this.flags = flags }) -infix fun VkCommandBuffer.begin(conditionalRenderingBegin: VkConditionalRenderingBeginInfoEXT) = +infix fun VkCommandBuffer.beginConditionalRenderingEXT(conditionalRenderingBegin: VkConditionalRenderingBeginInfoEXT) = EXTConditionalRendering.nvkCmdBeginConditionalRenderingEXT(this, conditionalRenderingBegin.adr) -fun VkCommandBuffer.beginRenderPass(renderPassBegin: VkRenderPassBeginInfo, contents: VkSubpassContents) = VK10.nvkCmdBeginRenderPass(this, renderPassBegin.adr, contents.i) +infix fun VkCommandBuffer.beginDebugUtilsLabelEXT(labelInfo: VkDebugUtilsLabelEXT) = + EXTDebugUtils.nvkCmdBeginDebugUtilsLabelEXT(this, labelInfo.adr) -fun VkCommandBuffer.bindDescriptorSets(pipelineBindPoint: VkPipelineBindPoint, layout: VkPipelineLayout, descriptorSets: VkDescriptorSetBuffer, dynamicOffsets: IntBuffer) { - VK10.nvkCmdBindDescriptorSets(this, pipelineBindPoint.i, layout.L, 0, descriptorSets.rem, descriptorSets.adr, dynamicOffsets.rem, dynamicOffsets.adr) -} +fun VkCommandBuffer.beginQuery(queryPool: VkQueryPool, query: Int, flags: VkQueryControlFlags) = + VK10.vkCmdBeginQuery(this, queryPool.L, query, flags) + +fun VkCommandBuffer.beginQueryIndexedEXT(queryPool: VkQueryPool, query: Int, flags: VkQueryControlFlags, index: Int) = + EXTTransformFeedback.vkCmdBeginQueryIndexedEXT(this, queryPool.L, query, flags, index) + +fun VkCommandBuffer.beginRenderPass(renderPassBegin: VkRenderPassBeginInfo, contents: VkSubpassContents) = + VK10.nvkCmdBeginRenderPass(this, renderPassBegin.adr, contents.i) + +fun VkCommandBuffer.beginRenderPass2KHR(renderPassBegin: VkRenderPassBeginInfo, subpassBeginInfo: VkSubpassBeginInfoKHR) = + KHRCreateRenderpass2.nvkCmdBeginRenderPass2KHR(this, renderPassBegin.adr, subpassBeginInfo.adr) + +fun VkCommandBuffer.beginTransformFeedbackEXT(firstCounterBuffer: Int, counterBuffers: VkBufferBuffer?, + counterBufferOffsets: VkDeviceSizeBuffer?) = + EXTTransformFeedback.nvkCmdBeginTransformFeedbackEXT(this, firstCounterBuffer, counterBuffers?.rem + ?: 0, counterBuffers?.adr ?: NULL, counterBufferOffsets?.adr ?: NULL) + +fun VkCommandBuffer.bindDescriptorSets(pipelineBindPoint: VkPipelineBindPoint, + layout: VkPipelineLayout, + descriptorSets: VkDescriptorSetBuffer, + dynamicOffsets: IntBuffer) = + VK10.nvkCmdBindDescriptorSets(this, pipelineBindPoint.i, layout.L, 0, descriptorSets.rem, descriptorSets.adr, dynamicOffsets.rem, dynamicOffsets.adr) + +fun VkCommandBuffer.bindDescriptorSets(pipelineBindPoint: VkPipelineBindPoint, + layout: VkPipelineLayout, + firstSet: Int, + descriptorSets: VkDescriptorSetBuffer, + dynamicOffsets: IntBuffer) = + VK10.nvkCmdBindDescriptorSets(this, pipelineBindPoint.i, layout.L, firstSet, descriptorSets.rem, descriptorSets.adr, dynamicOffsets.rem, dynamicOffsets.adr) -fun VkCommandBuffer.bindDescriptorSets(pipelineBindPoint: VkPipelineBindPoint, layout: VkPipelineLayout, descriptorSet: VkDescriptorSet, dynamicOffsets: Int? = null) = stak { +fun VkCommandBuffer.bindDescriptorSets(pipelineBindPoint: VkPipelineBindPoint, layout: VkPipelineLayout, + descriptorSet: VkDescriptorSet, dynamicOffsets: Int? = null) = stak { val pDescriptorSets = it.nmalloc(8, Long.BYTES) memPutLong(pDescriptorSets, descriptorSet.L) val dynamicOffsetCount: Int - val pDynamicOffset: Long - if (dynamicOffsets != null) { - dynamicOffsetCount = 1 - pDynamicOffset = it.nmalloc(1, Int.BYTES) - memPutInt(pDynamicOffset, dynamicOffsets) - } else { - dynamicOffsetCount = 0 - pDynamicOffset = NULL + val pDynamicOffset = when (dynamicOffsets) { + null -> { + dynamicOffsetCount = 0 + NULL + } + else -> { + dynamicOffsetCount = 1 + it.nmalloc(4, Int.BYTES).also { memPutInt(it, dynamicOffsets) } + } } VK10.nvkCmdBindDescriptorSets(this, pipelineBindPoint.i, layout.L, 0, 1, pDescriptorSets, dynamicOffsetCount, pDynamicOffset) } -fun VkCommandBuffer.bindIndexBuffer(buffer: VkBuffer, offset: VkDeviceSize, indexType: VkIndexType) = VK10.vkCmdBindIndexBuffer(this, buffer.L, offset.L, indexType.i) +fun VkCommandBuffer.bindIndexBuffer(buffer: VkBuffer, offset: VkDeviceSize, indexType: VkIndexType) = + VK10.vkCmdBindIndexBuffer(this, buffer.L, offset.L, indexType.i) -fun VkCommandBuffer.bindPipeline(pipelineBindPoint: VkPipelineBindPoint, pipeline: VkPipeline) = VK10.vkCmdBindPipeline(this, pipelineBindPoint.i, pipeline.L) +fun VkCommandBuffer.bindPipeline(pipelineBindPoint: VkPipelineBindPoint, pipeline: VkPipeline) = + VK10.vkCmdBindPipeline(this, pipelineBindPoint.i, pipeline.L) infix fun VkCommandBuffer.bindVertexBuffers(buffer: VkBuffer) = bindVertexBuffers(0, buffer) @@ -137,11 +168,6 @@ fun VkCommandBuffer.pipelineBarrier(srcStageMask: VkPipelineStageFlags, dstStage fun VkCommandBuffer.pushConstants(layout: VkPipelineLayout, stageFlags: VkShaderStageFlags, offset: Int, values: Buffer) = VK10.nvkCmdPushConstants(this, layout.L, stageFlags, offset, values.remSize, values.adr) -/** begin .. end */ -inline fun VkCommandBuffer.record(beginInfo: VkCommandBufferBeginInfo, block: VkCommandBuffer.() -> R): R { - begin(beginInfo) - return block().also { end() } -} fun VkCommandBuffer.reset(flags: VkCommandBufferResetFlags = 0) = VK_CHECK_RESULT(VK10.vkResetCommandBuffer(this, flags)) @@ -186,3 +212,52 @@ fun VkCommandBuffer.writeTimestamp(pipelineStage: VkPipelineStageFlags, queryPoo //inline fun VkCommandBuffer.setBlendConstants(depthBiasConstantFactor: Float, depthBiasClamp: Float, depthBiasSlopeFactor: Float) { // VK10.setBlendConstants(this, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor) //} + +// ---------- Inline lambdas ---------- + +/** begin .. end */ +inline fun VkCommandBuffer.record(beginInfo: VkCommandBufferBeginInfo, block: VkCommandBuffer.() -> R): R { + begin(beginInfo) + return block().also { end() } +} + +//inline fun VkCommandBuffer.conditionalRenderingEXT(conditionalRenderingBegin: VkConditionalRenderingBeginInfoEXT, +// block: VkCommandBuffer.() -> R): R { +// beginConditionalRenderingEXT(conditionalRenderingBegin) +// return block().also { endConditionalRenderingEXT() } +//} +// +//inline fun VkCommandBuffer.debugUtilsLabelEXT(labelInfo: VkDebugUtilsLabelEXT, block: VkCommandBuffer.() -> R): R { +// beginDebugUtilsLabelEXT(labelInfo) +// return block().also { endDebugUtilsLabelEXT() } +//} +// +//inline fun VkCommandBuffer.query(queryPool: VkQueryPool, query: Int, flags: VkQueryControlFlags, block: VkCommandBuffer.() -> R): R { +// beginQuery(queryPool, query, flags) +// return block().also { endQuery() } +//} +// +//inline fun VkCommandBuffer.queryIndexedEXT(queryPool: VkQueryPool, query: Int, flags: VkQueryControlFlags, +// index: Int, block: VkCommandBuffer.() -> R): R { +// beginQueryIndexedEXT(queryPool, query, flags, index) +// return block().also { endQueryIndexedEXT() } +//} +// +//inline fun VkCommandBuffer.renderPass(renderPassBegin: VkRenderPassBeginInfo, contents: VkSubpassContents, +// block: VkCommandBuffer.() -> R): R { +// beginRenderPass(renderPassBegin, contents) +// return block().also { endRenderPass() } +//} +// +//inline fun VkCommandBuffer.renderPass2KHR(renderPassBegin: VkRenderPassBeginInfo, subpassBeginInfo: VkSubpassBeginInfoKHR, +// block: VkCommandBuffer.() -> R): R { +// beginRenderPass2KHR(renderPassBegin, subpassBeginInfo) +// return block().also { endRenderPass2KHR() } +//} +// +//inline fun VkCommandBuffer.transformFeedbackEXT(firstCounterBuffer: Int, counterBuffers: VkBufferBuffer?, +// counterBufferOffsets: VkDeviceSizeBuffer?, +// block: VkCommandBuffer.() -> R): R { +// beginTransformFeedbackEXT(firstCounterBuffer, counterBuffers, counterBufferOffsets) +// return block().also { endTransformFeedbackEXT() } +//} \ No newline at end of file diff --git a/src/main/kotlin/vkk/vk.kt b/src/main/kotlin/vkk/vk.kt index f7d2f43..5d53553 100644 --- a/src/main/kotlin/vkk/vk.kt +++ b/src/main/kotlin/vkk/vk.kt @@ -1403,5 +1403,5 @@ object vk { VK10.nvkUpdateDescriptorSets(device, descriptorWrites.remaining(), descriptorWrites.adr, descriptorCopies?.remaining() ?: 0, descriptorCopies?.adr ?: NULL) - val VERSION = "0.2.2" + val VERSION = "0.2.4" } diff --git a/vkk.iml b/vkk.iml index 8111d48..74bc341 100644 --- a/vkk.iml +++ b/vkk.iml @@ -6,7 +6,7 @@