[Vulkan] Fix javadoc

Over-Run · Apr 14, 2024 · 3338ce6 · 3338ce6
1 parent acc4764
commit 3338ce6
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 15 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -37,8 +37,10 @@ jobs:
         run: chmod +x gradlew
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
-      - name: Execute Gradle build
-        run: ./gradlew build
+      - name: Build core module
+        run: ./gradlew :core:build
+      - name: Build other modules
+        run: ./gradlew build --parallel
 #      - name: Upload build reports
 #        uses: actions/upload-artifact@v4
 #        with:

diff --git a/generators/vulkan/src/main/kotlin/overrungl/vulkan/VulkanGenerator.kt b/generators/vulkan/src/main/kotlin/overrungl/vulkan/VulkanGenerator.kt
@@ -221,7 +221,7 @@ fun main() {
                         "enum" -> {
                             val clazz = VKFile(enumName, classType = "enum")
                             clazz.superinterfaces.add("overrun.marshal.CEnum")
-                            val endsWithVendor = endsWithVendor(enumName) != null
+                            val clazzVendor = endsWithVendor(enumName)
                             val prefix = "${
                                 removeVendorSuffix(enumName)
                                     .replace(UPPERCASE) { "_${it.groupValues[1]}" }
@@ -233,12 +233,12 @@ fun main() {
                                     val attrib = node.attributes
                                     val name =
                                         attrib["name"].nodeValue.removePrefix(prefix)
-                                            .let { if (endsWithVendor) removeVendorSuffix(it) else it }
+                                            .let { if (clazzVendor == endsWithVendor(it)) removeVendorSuffix(it) else it }
                                             .removeSuffix("_")
                                             .removeConstPrefix()
                                     val alias = attrib["alias"]?.nodeValue
                                         ?.removePrefix(prefix)
-                                        ?.let { if (endsWithVendor) removeVendorSuffix(it) else it }
+                                        ?.let { if (clazzVendor == endsWithVendor(it)) removeVendorSuffix(it) else it }
                                         ?.removeSuffix("_")
                                         ?.removeConstPrefix()
                                     if (alias != null) {
@@ -255,6 +255,9 @@ fun main() {
                                                 name = name,
                                                 args = listOf(attrib["value"].nodeValue),
                                                 document = attrib["comment"]?.nodeValue
+                                                    ?.replace("&", "&amp;")
+                                                    ?.replace("<", "&lt;")
+                                                    ?.replace(">", "&gt;")
                                             )
                                         )
                                     }

diff --git a/modules/overrungl.vulkan/src/main/java/overrungl/vulkan/VkDriverId.java b/modules/overrungl.vulkan/src/main/java/overrungl/vulkan/VkDriverId.java
@@ -75,7 +75,7 @@ public enum VkDriverId implements overrun.marshal.CEnum {
      */
     MOLTENVK(14),
     /**
-     * Core Avionics & Industrial Inc.
+     * Core Avionics &amp; Industrial Inc.
      */
     COREAVI_PROPRIETARY(15),
     /**

diff --git a/modules/overrungl.vulkan/src/main/java/overrungl/vulkan/VkLineRasterizationModeKHR.java b/modules/overrungl.vulkan/src/main/java/overrungl/vulkan/VkLineRasterizationModeKHR.java
@@ -19,13 +19,13 @@
 
 public enum VkLineRasterizationModeKHR implements overrun.marshal.CEnum {
     DEFAULT(0),
-    DEFAULT(DEFAULT.value),
+    DEFAULT_EXT(DEFAULT.value),
     RECTANGULAR(1),
-    RECTANGULAR(RECTANGULAR.value),
+    RECTANGULAR_EXT(RECTANGULAR.value),
     BRESENHAM(2),
-    BRESENHAM(BRESENHAM.value),
+    BRESENHAM_EXT(BRESENHAM.value),
     RECTANGULAR_SMOOTH(3),
-    RECTANGULAR_SMOOTH(RECTANGULAR_SMOOTH.value),
+    RECTANGULAR_SMOOTH_EXT(RECTANGULAR_SMOOTH.value),
     ;
     private final int value;
     VkLineRasterizationModeKHR(int value) { this.value = value; }

diff --git a/modules/overrungl.vulkan/src/main/java/overrungl/vulkan/VkQueueGlobalPriorityKHR.java b/modules/overrungl.vulkan/src/main/java/overrungl/vulkan/VkQueueGlobalPriorityKHR.java
@@ -22,10 +22,10 @@ public enum VkQueueGlobalPriorityKHR implements overrun.marshal.CEnum {
     MEDIUM(256),
     HIGH(512),
     REALTIME(1024),
-    LOW(LOW.value),
-    MEDIUM(MEDIUM.value),
-    HIGH(HIGH.value),
-    REALTIME(REALTIME.value),
+    LOW_EXT(LOW.value),
+    MEDIUM_EXT(MEDIUM.value),
+    HIGH_EXT(HIGH.value),
+    REALTIME_EXT(REALTIME.value),
     ;
     private final int value;
     VkQueueGlobalPriorityKHR(int value) { this.value = value; }

diff --git a/modules/overrungl.vulkan/src/main/java/overrungl/vulkan/VkResult.java b/modules/overrungl.vulkan/src/main/java/overrungl/vulkan/VkResult.java
@@ -55,7 +55,7 @@ public enum VkResult implements overrun.marshal.CEnum {
      */
     ERROR_INITIALIZATION_FAILED(-3),
     /**
-     * The logical device has been lost. See <<devsandqueues-lost-device>>
+     * The logical device has been lost. See &lt;&lt;devsandqueues-lost-device&gt;&gt;
      */
     ERROR_DEVICE_LOST(-4),
     /**