Merge branch 'api-vulkan-guide-rust'

WithoutPlastic · Sep 7, 2024 · a98df35 · a98df35
2 parents e4b0cb8 + 92ac837
commit a98df35
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.../source-main/library_foundation_application_guide/src/application_v1_1_c0/continuation.rs b/.../source-main/library_foundation_application_guide/src/application_v1_1_c0/continuation.rs
@@ -14,8 +14,8 @@ impl ApplicationContinuation {
     {
         type WE = WindowUniformEvent<()>;
         type WEW = WindowUniformEventWindow;
-        let (wp_application, mut mp_application) = application.unwrap();
-        wp_application.window_event_loop.run(move |event, window_target| {
+        let (wp_application, mut mp_application) = application.as_raw();
+        wp_application.window_event_loop.run(move |event: WindowUniformEvent<()>, window_target| {
             match event {
                 WE::AboutToWait => {
                     todo!()

diff --git a/...ource-main/library_foundation_application_guide/src/application_v1_1_c0/initialization.rs b/...ource-main/library_foundation_application_guide/src/application_v1_1_c0/initialization.rs
@@ -31,12 +31,12 @@ impl ApplicationInitialization {
         let vulkan_application_information =
             config.vulkan.create_vulkan_application_information(&api_version);
         let vulkan_instance_layer_name_s =
-            VulkanRequirementInstance::fulfill_layer_name_s(
+            VulkanRequirementInstance::fulfill_layer_s(
                 vulkan_entry,
                 &config.vulkan.instance_layer_name_s_required,
                 &config.vulkan.instance_layer_name_s_optional)?;
         let vulkan_instance_extension_name_s =
-            VulkanRequirementInstance::fulfill_extension_name_s(
+            VulkanRequirementInstance::fulfill_extension_s(
                 vulkan_entry,
                 &config.vulkan.instance_extension_window_name_s,
                 &config.vulkan.instance_extension_name_s_required,

diff --git a/...oundation_application_guide/src/application_v1_1_c0/negotiation_vulkan_device_physical.rs b/...oundation_application_guide/src/application_v1_1_c0/negotiation_vulkan_device_physical.rs
@@ -87,7 +87,7 @@ impl ApplicationNegotiationVulkanDevicePhysical {
                 vulkan_instance, vulkan_physical_device, vulkan_surface)
             .map_err(map_err)?;
         let (matched_extension_name_s, matched_optional_extension_number) =
-            VulkanRequirementDevicePhysical::fulfill_extension_name_s(
+            VulkanRequirementDevicePhysical::fulfill_extension_s(
                 vulkan_instance, vulkan_physical_device,
                 &config.vulkan.device_physical_extension_name_s_required,
                 &config.vulkan.device_physical_extension_name_s_optional)