Fix output structs in command wrappers

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
 

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()}")

vulkanalia/src/chain.rs

@@ -58,9 +58,14 @@
 //! # use vk::KhrGetPhysicalDeviceProperties2Extension;
 //! # let instance: Instance = panic!();
 //! # let physical_device: vk::PhysicalDevice = panic!();
-//! // Call a command that returns an output pointer chain.
+//! // Call a command that populates an output pointer chain.
+//!
+//! let mut features_11 = vk::PhysicalDeviceVulkan11Features::default();
+//! let mut features_12 = vk::PhysicalDeviceVulkan12Features::default();
+//! let mut features = vk::PhysicalDeviceFeatures2::builder()
+//!     .push_next(&mut features_11)
+//!     .push_next(&mut features_12);
 //!
-//! let mut features = vk::PhysicalDeviceFeatures2::default();
 //! unsafe { instance.get_physical_device_features2_khr(physical_device, &mut features) };
 //!
 //! // Iterate over the pointers in the output pointer chain.
@@ -71,14 +76,14 @@
 //! // Inspect the pointers in the output pointer chain.
 //!
 //! let base = unsafe { structs[0].as_base_ref() };
-//! assert_eq!(base.s_type, vk::StructureType::PHYSICAL_DEVICE_VULKAN_1_1_FEATURES);
-//! let full = unsafe { structs[0].as_ref::<vk::PhysicalDeviceVulkan11Features>() };
-//! assert_eq!(full.protected_memory, 1);
-//!
-//! let base = unsafe { structs[0].as_base_ref() };
 //! assert_eq!(base.s_type, vk::StructureType::PHYSICAL_DEVICE_VULKAN_1_2_FEATURES);
 //! let full = unsafe { structs[0].as_ref::<vk::PhysicalDeviceVulkan12Features>() };
-//! assert_eq!(full.descriptor_indexing, 1);
+//! assert_eq!(full.descriptor_indexing, 1);       
+//!
+//! let base = unsafe { structs[1].as_base_ref() };
+//! assert_eq!(base.s_type, vk::StructureType::PHYSICAL_DEVICE_VULKAN_1_1_FEATURES);
+//! let full = unsafe { structs[1].as_ref::<vk::PhysicalDeviceVulkan11Features>() };
+//! assert_eq!(full.protected_memory, 1);
 //! ```
 
 use core::ffi::c_void;