Fix output structs in command wrappers (#213)

KyleMayes · Sep 23, 2023 · 88f35df · 88f35df
1 parent 8dd834e
commit 88f35df
Show file tree

Hide file tree

Showing 4 changed files with 109 additions and 164 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Changed
 - Added `no_std` compability for `vulkanalia` and `vulkanalia-sys` crates
+- Make all extendable output structs parameters in command wrappers (see [#213](https://github.com/KyleMayes/vulkanalia/issues/213) for details)
 
 ## [0.22.0] - 2023-09-15
 

diff --git a/generator/src/main/kotlin/com/kylemayes/generator/generate/support/Wrapper.kt b/generator/src/main/kotlin/com/kylemayes/generator/generate/support/Wrapper.kt
@@ -174,7 +174,7 @@ fun Registry.generateCommandWrapper(command: Command): String {
             // input when the output type is an extendable struct so that the
             // user can provide the extension structs for the information they
             // want to be populated in the output parameter.
-            val extendable = getStructExtensions().containsKey(pointee.getIdentifier())
+            val extendable = getChainStructs().containsKey(pointee.getIdentifier())
 
             if (output && !extendable) {
                 // Output pointer parameter (uninit-provided).
@@ -190,10 +190,15 @@ fun Registry.generateCommandWrapper(command: Command): String {
                 resultTypes.add(resultType)
                 resultExprs.add("${current.name}.assume_init()$exprCast")
                 addArgument("${current.name}.as_mut_ptr()")
-            } else if (output && extendable) {
+            } else if (output) {
                 // Output pointer parameter (user-provided).
-                params.add("${current.name}: &mut ${pointee.generate()}")
-                addArgument(current.name.value)
+                if (current.optional) {
+                    params.add("${current.name}: Option<&mut ${pointee.generate()}>")
+                    addArgument("${current.name}.map_or(ptr::null_mut(), |v| v)")
+                } else {
+                    params.add("${current.name}: &mut ${pointee.generate()}")
+                    addArgument(current.name.value)
+                }
             } else if (current.type.isOpaquePointer()) {
                 // Input pointer parameter (opaque).
                 params.add("${current.name}: ${current.type.generate()}")