feat(api): [vulkan] remove VK_API_VERSION* macros in VK11+

Over-Run · Jan 15, 2025 · 7a963c6 · 7a963c6
1 parent ff26bbc
commit 7a963c6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 24 deletions.
diff --git a/generators/vulkan/src/main/kotlin/overrungl/vulkan/VulkanGenerator.kt b/generators/vulkan/src/main/kotlin/overrungl/vulkan/VulkanGenerator.kt
@@ -552,10 +552,12 @@ fun main() {
             VkDowncall(vulkanPackage, className) {
                 vkExtends[featureNumber]?.also { extends.add("VK$it") }
 
-                defineVkVersion.forEach { (k, v) ->
-                    fields.add(
-                        VkDowncallField("int", k, v)
-                    )
+                if (featureNumber == "1.0") {
+                    defineVkVersion.forEach { (k, v) ->
+                        fields.add(
+                            VkDowncallField("int", k, v)
+                        )
+                    }
                 }
 
                 addReqTypes(featureReqTypes)

diff --git a/modules/overrungl.vulkan/src/main/java/overrungl/vulkan/VK11.java b/modules/overrungl.vulkan/src/main/java/overrungl/vulkan/VK11.java
@@ -22,11 +22,6 @@
 import overrungl.internal.RuntimeHelper;
 import overrungl.util.*;
 public class VK11 extends VK10 {
-    public static final int VK_API_VERSION_1_0 = VK_MAKE_API_VERSION(0, 1, 0, 0);
-    public static final int VK_API_VERSION_1_1 = VK_MAKE_API_VERSION(0, 1, 1, 0);
-    public static final int VK_API_VERSION_1_2 = VK_MAKE_API_VERSION(0, 1, 2, 0);
-    public static final int VK_API_VERSION_1_3 = VK_MAKE_API_VERSION(0, 1, 3, 0);
-    public static final int VK_API_VERSION_1_4 = VK_MAKE_API_VERSION(0, 1, 4, 0);
     public static final int VK_SUBGROUP_FEATURE_BASIC_BIT = 0x00000001;
     public static final int VK_SUBGROUP_FEATURE_VOTE_BIT = 0x00000002;
     public static final int VK_SUBGROUP_FEATURE_ARITHMETIC_BIT = 0x00000004;

diff --git a/modules/overrungl.vulkan/src/main/java/overrungl/vulkan/VK12.java b/modules/overrungl.vulkan/src/main/java/overrungl/vulkan/VK12.java
@@ -22,11 +22,6 @@
 import overrungl.internal.RuntimeHelper;
 import overrungl.util.*;
 public class VK12 extends VK11 {
-    public static final int VK_API_VERSION_1_0 = VK_MAKE_API_VERSION(0, 1, 0, 0);
-    public static final int VK_API_VERSION_1_1 = VK_MAKE_API_VERSION(0, 1, 1, 0);
-    public static final int VK_API_VERSION_1_2 = VK_MAKE_API_VERSION(0, 1, 2, 0);
-    public static final int VK_API_VERSION_1_3 = VK_MAKE_API_VERSION(0, 1, 3, 0);
-    public static final int VK_API_VERSION_1_4 = VK_MAKE_API_VERSION(0, 1, 4, 0);
     public static final int VK_DRIVER_ID_AMD_PROPRIETARY = 1;
     public static final int VK_DRIVER_ID_AMD_OPEN_SOURCE = 2;
     public static final int VK_DRIVER_ID_MESA_RADV = 3;

diff --git a/modules/overrungl.vulkan/src/main/java/overrungl/vulkan/VK13.java b/modules/overrungl.vulkan/src/main/java/overrungl/vulkan/VK13.java
@@ -22,11 +22,6 @@
 import overrungl.internal.RuntimeHelper;
 import overrungl.util.*;
 public class VK13 extends VK12 {
-    public static final int VK_API_VERSION_1_0 = VK_MAKE_API_VERSION(0, 1, 0, 0);
-    public static final int VK_API_VERSION_1_1 = VK_MAKE_API_VERSION(0, 1, 1, 0);
-    public static final int VK_API_VERSION_1_2 = VK_MAKE_API_VERSION(0, 1, 2, 0);
-    public static final int VK_API_VERSION_1_3 = VK_MAKE_API_VERSION(0, 1, 3, 0);
-    public static final int VK_API_VERSION_1_4 = VK_MAKE_API_VERSION(0, 1, 4, 0);
     public static final int VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT = 0x00000001;
     public static final int VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT = 0x00000002;
     public static final int VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT = 0x00000004;

diff --git a/modules/overrungl.vulkan/src/main/java/overrungl/vulkan/VK14.java b/modules/overrungl.vulkan/src/main/java/overrungl/vulkan/VK14.java
@@ -22,11 +22,6 @@
 import overrungl.internal.RuntimeHelper;
 import overrungl.util.*;
 public class VK14 extends VK13 {
-    public static final int VK_API_VERSION_1_0 = VK_MAKE_API_VERSION(0, 1, 0, 0);
-    public static final int VK_API_VERSION_1_1 = VK_MAKE_API_VERSION(0, 1, 1, 0);
-    public static final int VK_API_VERSION_1_2 = VK_MAKE_API_VERSION(0, 1, 2, 0);
-    public static final int VK_API_VERSION_1_3 = VK_MAKE_API_VERSION(0, 1, 3, 0);
-    public static final int VK_API_VERSION_1_4 = VK_MAKE_API_VERSION(0, 1, 4, 0);
     public static final int VK_QUEUE_GLOBAL_PRIORITY_LOW = 128;
     public static final int VK_QUEUE_GLOBAL_PRIORITY_MEDIUM = 256;
     public static final int VK_QUEUE_GLOBAL_PRIORITY_HIGH = 512;