up

kotlin-graphics · Feb 26, 2019 · 1a86547 · 1a86547
1 parent f09cfe6
commit 1a86547
Show file tree

Hide file tree

Showing 12 changed files with 317 additions and 56 deletions.
diff --git a/...aries/Gradle__com_github_kotlin_graphics_gli_42d5ecff1637632c823e230ae5cf3b618051e40f.xml b/...aries/Gradle__com_github_kotlin_graphics_gli_42d5ecff1637632c823e230ae5cf3b618051e40f.xml
diff --git a/.idea/libraries/Gradle__com_github_kotlin_graphics_gli_v0_8_3_0_build_12.xml b/.idea/libraries/Gradle__com_github_kotlin_graphics_gli_v0_8_3_0_build_12.xml
diff --git a/.idea/libraries/Gradle__graphics_scenery_spirvcrossj_0_5_0_1_1_85_natives_windows.xml b/.idea/libraries/Gradle__graphics_scenery_spirvcrossj_0_5_0_1_1_85_natives_windows.xml
diff --git a/...etbrains_kotlin_kotlin_reflect_1_3_11.xml → ...etbrains_kotlin_kotlin_reflect_1_3_21.xml b/...etbrains_kotlin_kotlin_reflect_1_3_11.xml → ...etbrains_kotlin_kotlin_reflect_1_3_21.xml
diff --git a/...jetbrains_kotlin_kotlin_stdlib_1_3_11.xml → ...jetbrains_kotlin_kotlin_stdlib_1_3_21.xml b/...jetbrains_kotlin_kotlin_stdlib_1_3_11.xml → ...jetbrains_kotlin_kotlin_stdlib_1_3_21.xml
diff --git a/...ns_kotlin_kotlin_stdlib_common_1_3_11.xml → ...ns_kotlin_kotlin_stdlib_common_1_3_21.xml b/...ns_kotlin_kotlin_stdlib_common_1_3_11.xml → ...ns_kotlin_kotlin_stdlib_common_1_3_21.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/build.gradle b/build.gradle
@@ -4,9 +4,9 @@ plugins {
     id 'maven'
     id 'java'
     id 'java-library'
-    id "org.jetbrains.kotlin.jvm" version "1.3.11"
+    id "org.jetbrains.kotlin.jvm" version "1.3.21"
 //    id "org.jetbrains.kotlin.kapt" version "1.3.10"
-    id "com.github.johnrengelman.shadow" version '4.0.3'
+    id "com.github.johnrengelman.shadow" version '4.0.4'
 }
 
 // jitpack
@@ -16,7 +16,7 @@ ext{
     moduleName = 'com.github.kotlin_graphics.vkk'
     kotlin = 'org.jetbrains.kotlin:kotlin'
     kotlin_version = '1.3.21'
-    gli_version = '42d5ecff1637632c823e230ae5cf3b618051e40f'
+    gli_version = 'v0.8.3.0-build-12'
     lwjgl_version = "3.2.2-SNAPSHOT"
     lwjgl_natives = current() == WINDOWS ? "windows" : current() == LINUX ? "linux" : "macos"
     sprivCross_version = "0.5.0-1.1.85"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
diff --git a/src/main/kotlin/vkk/entities/objects.kt b/src/main/kotlin/vkk/entities/objects.kt
@@ -164,3 +164,5 @@ inline class VkSwapchainKHR(val L: Long) {
 
 inline class VkDisplayKHR(val L: Long)
 inline class VkDisplayModeKHR (val L: Long)
+inline class VkObjectTableNVX  (val L: Long)
+inline class VkIndirectCommandsLayoutNVX   (val L: Long)