Merge pull request #69 from Over-Run/feature

Over-Run · Jan 9, 2025 · 051d3b2 · 051d3b2
2 parents fe9f316 + 6a9522c
commit 051d3b2
Show file tree

Hide file tree

Showing 357 changed files with 12,893 additions and 16,377 deletions.
diff --git a/generators/opengl/src/main/kotlin/overrungl/opengl/InstanceDowncall.kt b/generators/opengl/src/main/kotlin/overrungl/opengl/InstanceDowncall.kt
@@ -35,6 +35,8 @@ class InstanceDowncall(
     private val extends = mutableListOf<String>()
     private val permits = mutableListOf<String>()
     private val fields = mutableListOf<InstanceDowncallField>()
+    val handleFields = mutableListOf<InstanceDowncallField>()
+    val pfnFields = mutableListOf<InstanceDowncallField>()
     private val methods = mutableListOf<InstanceDowncallMethod>()
 
     init {
@@ -93,18 +95,23 @@ class InstanceDowncall(
         sb.appendLine(" {")
 
         // fields
-        fields.forEach {
-            sb.append("    public")
-            if (it.modifier != null) {
-                sb.append(" ")
-                sb.append(it.modifier)
+        fun writeFields(list: List<InstanceDowncallField>) {
+            list.forEach {
+                sb.append("    public")
+                if (it.modifier != null) {
+                    sb.append(" ")
+                    sb.append(it.modifier)
+                }
+                sb.append(" final ${it.type} ${it.name}")
+                if (it.value != null) {
+                    sb.append(" = ${it.value}")
+                }
+                sb.appendLine(";")
             }
-            sb.append(" final ${it.type} ${it.name}")
-            if (it.value != null) {
-                sb.append(" = ${it.value}")
-            }
-            sb.appendLine(";")
         }
+        writeFields(fields)
+        writeFields(handleFields)
+        writeFields(pfnFields)
 
         // constructor
         sb.appendLine()
@@ -130,18 +137,17 @@ class InstanceDowncall(
             sb.append(m.params.joinToString(", ") { p -> "${p.type.carrierWithC()} ${p.name}" })
             sb.appendLine(") {")
 
-            sb.appendLine("        if (!Unmarshal.isNullPointer(PFN_${m.entrypoint})) { try {")
-            sb.append("            ")
+            sb.appendLine("""        if (Unmarshal.isNullPointer(PFN_${m.entrypoint})) throw new SymbolNotFoundError("Symbol not found: ${m.entrypoint}");""")
+            sb.append("        try { ")
             if (m.returnType.carrier != TypeName.VOID) {
                 sb.append("return (${m.returnType.carrier}) ")
             }
             sb.append("MH_${m.entrypoint}.invokeExact(PFN_${m.entrypoint}")
             m.params.forEach {
                 sb.append(", ${it.name}")
             }
-            sb.appendLine(");")
-            sb.appendLine("""        } catch (Throwable e) { throw new RuntimeException("error in ${m.entrypoint}", e); }""")
-            sb.appendLine("""        } else { throw new SymbolNotFoundError("Symbol not found: ${m.entrypoint}"); }""")
+            sb.appendLine("); }")
+            sb.appendLine("""        catch (Throwable e) { throw new RuntimeException("error in ${m.entrypoint}", e); }""")
 
             sb.appendLine("    }")
             sb.appendLine()

diff --git a/generators/opengl/src/main/kotlin/overrungl/opengl/OpenGLGenerator.kt b/generators/opengl/src/main/kotlin/overrungl/opengl/OpenGLGenerator.kt
@@ -639,7 +639,7 @@ fun main() {
     fun InstanceDowncall.addCommand(command: GLRequireCommand) {
         val get = commandMap[command.name]!!
         // handles
-        field(
+        handleFields.add(
             InstanceDowncallField(
                 modifier = "static",
                 type = "MethodHandle",
@@ -649,7 +649,7 @@ fun main() {
         )
 
         // address
-        field(
+        pfnFields.add(
             InstanceDowncallField(
                 type = "MemorySegment",
                 name = "PFN_${get.name}"

diff --git a/generators/src/main/kotlin/overrungl/gen/StaticDowncall.kt b/generators/src/main/kotlin/overrungl/gen/StaticDowncall.kt
@@ -200,7 +200,7 @@ class StaticDowncall(
 
                     // optional
                     if (m.optional) {
-                        sb.appendLine("        if (Handles.MH_${m.entrypoint} != null) {")
+                        sb.appendLine("""        if (Handles.MH_${m.entrypoint} == null) throw new SymbolNotFoundError("Symbol not found: ${m.entrypoint}");""")
                     }
 
                     // header
@@ -272,10 +272,6 @@ class StaticDowncall(
                     }
 
                     sb.appendLine("""        } catch (Throwable e) { throw new RuntimeException("error in ${m.entrypoint}", e); }""")
-
-                    if (m.optional) {
-                        sb.appendLine("""        } else { throw new SymbolNotFoundError("Symbol not found: ${m.entrypoint}"); }""")
-                    }
                 }
                 sb.appendLine("    }")
                 sb.appendLine()

diff --git a/generators/vulkan/src/main/kotlin/overrungl/vulkan/VkDowncall.kt b/generators/vulkan/src/main/kotlin/overrungl/vulkan/VkDowncall.kt
@@ -188,9 +188,9 @@ class VkDowncall(
                 import overrungl.annotation.*;
                 import overrungl.internal.RuntimeHelper;
                 import overrungl.util.*;
-                import overrungl.vulkan.*;
             """.trimIndent()
         )
+        if (packageName != vulkanPackage) sb.appendLine("import overrungl.vulkan.*;")
         imports.sorted().forEach { sb.appendLine("import $it;") }
         sb.append("public class $className")
         if (extends.isNotEmpty()) {