1 files changed, 34 insertions, 3 deletions
diff --git a/adapters/fparkan-render-vulkan/src/ffi/tests.rs b/adapters/fparkan-render-vulkan/src/ffi/tests.rs
index b06bb26..8dda737 100644
--- a/adapters/fparkan-render-vulkan/src/ffi/tests.rs
+++ b/adapters/fparkan-render-vulkan/src/ffi/tests.rs
@@ -419,6 +419,32 @@ fn swapchain_plan_enables_transfer_source_when_surface_supports_it() {
 }
 
 #[test]
+fn swapchain_plan_falls_back_to_immediate_without_overriding_supported_preference() {
+    let mut request = swapchain_request();
+    request.present_modes = vec![
+        vk::PresentModeKHR::IMMEDIATE.as_raw(),
+        vk::PresentModeKHR::FIFO.as_raw(),
+    ];
+    assert_eq!(
+        plan_vulkan_swapchain(&request).unwrap().present_mode,
+        vk::PresentModeKHR::IMMEDIATE.as_raw()
+    );
+    request.preferred_present_mode = vk::PresentModeKHR::FIFO.as_raw();
+    assert_eq!(
+        plan_vulkan_swapchain(&request).unwrap().present_mode,
+        vk::PresentModeKHR::FIFO.as_raw()
+    );
+    request
+        .present_modes
+        .push(vk::PresentModeKHR::MAILBOX.as_raw());
+    request.preferred_present_mode = vk::PresentModeKHR::MAILBOX.as_raw();
+    assert_eq!(
+        plan_vulkan_swapchain(&request).unwrap().present_mode,
+        vk::PresentModeKHR::MAILBOX.as_raw()
+    );
+}
+
+#[test]
 fn swapchain_plan_uses_fifo_and_current_extent_fallbacks() {
     let mut request = swapchain_request();
     request.preferred_present_mode = vk::PresentModeKHR::IMMEDIATE.as_raw();
@@ -492,8 +518,9 @@ fn fragment_shader_dispatches_all_four_material_modes() {
 }
 
 #[test]
-fn point_light_storage_payload_is_counted_and_packed_as_three_vec4s() {
+fn point_light_storage_payload_preserves_integer_owner_scope_and_stride() {
     let lights = [VulkanPointLight {
+        owner_scope: 0x1234_5678,
         position: [1.0, 2.0, 3.0],
         rgb: [4.0, 5.0, 6.0],
         range: 7.0,
@@ -506,7 +533,7 @@ fn point_light_storage_payload_is_counted_and_packed_as_three_vec4s() {
         VULKAN_POINT_LIGHT_HEADER_BYTES + VULKAN_POINT_LIGHT_RECORD_BYTES
     );
     assert_eq!(u32::from_ne_bytes(bytes[0..4].try_into().unwrap()), 1);
-    let values = (0..12)
+    let values = (0..11)
         .map(|index| {
             let offset = VULKAN_POINT_LIGHT_HEADER_BYTES + index * std::mem::size_of::<f32>();
             f32::from_ne_bytes(bytes[offset..offset + 4].try_into().unwrap())
@@ -514,7 +541,11 @@ fn point_light_storage_payload_is_counted_and_packed_as_three_vec4s() {
         .collect::<Vec<_>>();
     assert_eq!(
         values,
-        vec![1.0, 2.0, 3.0, 7.0, 4.0, 5.0, 6.0, 1.0, 8.0, 9.0, 10.0, 1.0]
+        vec![1.0, 2.0, 3.0, 7.0, 4.0, 5.0, 6.0, 1.0, 8.0, 9.0, 10.0]
+    );
+    assert_eq!(
+        u32::from_ne_bytes(bytes[60..64].try_into().unwrap()),
+        0x1234_5678
     );
 
     let many = vec![VulkanPointLight::default(); 33];