diff --git a/src/tutorials/02_validation_layers.rs b/src/tutorials/02_validation_layers.rs index e399347..5274d6e 100644 --- a/src/tutorials/02_validation_layers.rs +++ b/src/tutorials/02_validation_layers.rs @@ -49,7 +49,7 @@ struct VulkanApp { _entry: ash::Entry, instance: ash::Instance, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, } impl VulkanApp { @@ -58,7 +58,7 @@ impl VulkanApp { // init vulkan stuff let entry = ash::Entry::new().unwrap(); let instance = VulkanApp::create_instance(&entry); - let (debug_utils_loader, debug_merssager) = VulkanApp::setup_debug_utils(&entry, &instance); + let (debug_utils_loader, debug_messenger) = VulkanApp::setup_debug_utils(&entry, &instance); // cleanup(); the 'drop' function will take care of it. VulkanApp { @@ -66,7 +66,7 @@ impl VulkanApp { _entry: entry, instance, debug_utils_loader, - debug_merssager, + debug_messenger, } } @@ -266,7 +266,7 @@ impl Drop for VulkanApp { unsafe { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/03_physical_device_selection.rs b/src/tutorials/03_physical_device_selection.rs index 6df12d4..60e9586 100644 --- a/src/tutorials/03_physical_device_selection.rs +++ b/src/tutorials/03_physical_device_selection.rs @@ -29,7 +29,7 @@ struct VulkanApp { _entry: ash::Entry, instance: ash::Instance, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, _physical_device: vk::PhysicalDevice, } @@ -45,7 +45,7 @@ impl VulkanApp { &VALIDATION.required_validation_layers.to_vec(), ); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = utility::debug::setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = VulkanApp::pick_physical_device(&instance); @@ -55,7 +55,7 @@ impl VulkanApp { _entry: entry, instance, debug_utils_loader, - debug_merssager, + debug_messenger, _physical_device: physical_device, } } @@ -213,7 +213,7 @@ impl Drop for VulkanApp { unsafe { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/04_logical_device.rs b/src/tutorials/04_logical_device.rs index 5661b9a..d806b6a 100644 --- a/src/tutorials/04_logical_device.rs +++ b/src/tutorials/04_logical_device.rs @@ -32,7 +32,7 @@ struct VulkanApp { _entry: ash::Entry, instance: ash::Instance, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenager: vk::DebugUtilsMessengerEXT, _physical_device: vk::PhysicalDevice, device: ash::Device, // Logical Device _graphics_queue: vk::Queue, @@ -48,7 +48,7 @@ impl VulkanApp { VALIDATION.is_enable, &VALIDATION.required_validation_layers.to_vec(), ); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = utility::debug::setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = VulkanApp::pick_physical_device(&instance); let (logical_device, graphics_queue) = @@ -59,7 +59,7 @@ impl VulkanApp { _entry: entry, instance, debug_utils_loader, - debug_merssager, + debug_messenager: debug_messenger, _physical_device: physical_device, device: logical_device, _graphics_queue: graphics_queue, @@ -200,7 +200,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenager, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/05_window_surface.rs b/src/tutorials/05_window_surface.rs index b0c580d..74585fa 100644 --- a/src/tutorials/05_window_surface.rs +++ b/src/tutorials/05_window_surface.rs @@ -47,7 +47,7 @@ struct VulkanApp { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, _physical_device: vk::PhysicalDevice, device: ash::Device, _graphics_queue: vk::Queue, @@ -64,7 +64,7 @@ impl VulkanApp { VALIDATION.is_enable, &VALIDATION.required_validation_layers.to_vec(), ); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = utility::debug::setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let surface_stuff = VulkanApp::create_surface(&entry, &instance, &window); let physical_device = VulkanApp::pick_physical_device(&instance, &surface_stuff); @@ -86,7 +86,7 @@ impl VulkanApp { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, _physical_device: physical_device, device, _graphics_queue: graphics_queue, @@ -271,7 +271,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/06_swap_chain_creation.rs b/src/tutorials/06_swap_chain_creation.rs index 3ab141d..d1b3442 100644 --- a/src/tutorials/06_swap_chain_creation.rs +++ b/src/tutorials/06_swap_chain_creation.rs @@ -66,7 +66,7 @@ struct VulkanApp { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, _physical_device: vk::PhysicalDevice, device: ash::Device, @@ -92,7 +92,7 @@ impl VulkanApp { &VALIDATION.required_validation_layers.to_vec(), ); let surface_stuff = VulkanApp::create_surface(&entry, &instance, &window); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = utility::debug::setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = VulkanApp::pick_physical_device(&instance, &surface_stuff); let (device, family_indices) = VulkanApp::create_logical_device( @@ -121,7 +121,7 @@ impl VulkanApp { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, _physical_device: physical_device, device, @@ -521,7 +521,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/07_image_view.rs b/src/tutorials/07_image_view.rs index 892a754..bdc9beb 100644 --- a/src/tutorials/07_image_view.rs +++ b/src/tutorials/07_image_view.rs @@ -23,7 +23,7 @@ struct VulkanApp { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, _physical_device: vk::PhysicalDevice, device: ash::Device, @@ -52,7 +52,7 @@ impl VulkanApp { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -88,7 +88,7 @@ impl VulkanApp { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, _physical_device: physical_device, device, @@ -165,7 +165,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/08_graphics_pipeline.rs b/src/tutorials/08_graphics_pipeline.rs index 62e9ce6..1bde62a 100644 --- a/src/tutorials/08_graphics_pipeline.rs +++ b/src/tutorials/08_graphics_pipeline.rs @@ -21,7 +21,7 @@ struct VulkanApp { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, _physical_device: vk::PhysicalDevice, device: ash::Device, @@ -49,7 +49,7 @@ impl VulkanApp { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -86,7 +86,7 @@ impl VulkanApp { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, _physical_device: physical_device, device, @@ -126,7 +126,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/09_shader_modules.rs b/src/tutorials/09_shader_modules.rs index e3e03a3..c015e58 100644 --- a/src/tutorials/09_shader_modules.rs +++ b/src/tutorials/09_shader_modules.rs @@ -25,7 +25,7 @@ struct VulkanApp { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, _physical_device: vk::PhysicalDevice, device: ash::Device, @@ -54,7 +54,7 @@ impl VulkanApp { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -91,7 +91,7 @@ impl VulkanApp { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, _physical_device: physical_device, device, @@ -194,7 +194,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/10_fixed_functions.rs b/src/tutorials/10_fixed_functions.rs index 414646d..38f5ec3 100644 --- a/src/tutorials/10_fixed_functions.rs +++ b/src/tutorials/10_fixed_functions.rs @@ -25,7 +25,7 @@ struct VulkanApp { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, _physical_device: vk::PhysicalDevice, device: ash::Device, @@ -55,7 +55,7 @@ impl VulkanApp { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -93,7 +93,7 @@ impl VulkanApp { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, _physical_device: physical_device, device, @@ -320,7 +320,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/11_render_passes.rs b/src/tutorials/11_render_passes.rs index dd6a086..2c7aa2b 100644 --- a/src/tutorials/11_render_passes.rs +++ b/src/tutorials/11_render_passes.rs @@ -24,7 +24,7 @@ struct VulkanApp { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, _physical_device: vk::PhysicalDevice, device: ash::Device, @@ -55,7 +55,7 @@ impl VulkanApp { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -94,7 +94,7 @@ impl VulkanApp { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, _physical_device: physical_device, device, @@ -375,7 +375,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/12_graphics_pipeline_complete.rs b/src/tutorials/12_graphics_pipeline_complete.rs index b339980..2388f4a 100644 --- a/src/tutorials/12_graphics_pipeline_complete.rs +++ b/src/tutorials/12_graphics_pipeline_complete.rs @@ -25,7 +25,7 @@ struct VulkanApp { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, _physical_device: vk::PhysicalDevice, device: ash::Device, @@ -57,7 +57,7 @@ impl VulkanApp { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -99,7 +99,7 @@ impl VulkanApp { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, _physical_device: physical_device, device, @@ -363,7 +363,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/13_framebuffers.rs b/src/tutorials/13_framebuffers.rs index 7575fd5..791b2b6 100644 --- a/src/tutorials/13_framebuffers.rs +++ b/src/tutorials/13_framebuffers.rs @@ -23,7 +23,7 @@ struct VulkanApp { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, _physical_device: vk::PhysicalDevice, device: ash::Device, @@ -56,7 +56,7 @@ impl VulkanApp { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -104,7 +104,7 @@ impl VulkanApp { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, _physical_device: physical_device, device, @@ -189,7 +189,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/14_command_buffers.rs b/src/tutorials/14_command_buffers.rs index bae040c..0927839 100644 --- a/src/tutorials/14_command_buffers.rs +++ b/src/tutorials/14_command_buffers.rs @@ -24,7 +24,7 @@ struct VulkanApp { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, _physical_device: vk::PhysicalDevice, device: ash::Device, @@ -60,7 +60,7 @@ impl VulkanApp { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -117,7 +117,7 @@ impl VulkanApp { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, _physical_device: physical_device, device, @@ -269,7 +269,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/15_hello_triangle.rs b/src/tutorials/15_hello_triangle.rs index 7420ffd..9fd1f42 100644 --- a/src/tutorials/15_hello_triangle.rs +++ b/src/tutorials/15_hello_triangle.rs @@ -31,7 +31,7 @@ struct VulkanApp { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, _physical_device: vk::PhysicalDevice, device: ash::Device, @@ -75,7 +75,7 @@ impl VulkanApp { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -135,7 +135,7 @@ impl VulkanApp { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, _physical_device: physical_device, device, @@ -375,7 +375,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/16_swap_chain_recreation.rs b/src/tutorials/16_swap_chain_recreation.rs index a3e2f8f..afb337d 100644 --- a/src/tutorials/16_swap_chain_recreation.rs +++ b/src/tutorials/16_swap_chain_recreation.rs @@ -26,7 +26,7 @@ struct VulkanApp { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, physical_device: vk::PhysicalDevice, device: ash::Device, @@ -72,7 +72,7 @@ impl VulkanApp { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -134,7 +134,7 @@ impl VulkanApp { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, physical_device, device, @@ -358,7 +358,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/17_vertex_input.rs b/src/tutorials/17_vertex_input.rs index 72e76a0..2388294 100644 --- a/src/tutorials/17_vertex_input.rs +++ b/src/tutorials/17_vertex_input.rs @@ -76,7 +76,7 @@ struct VulkanApp { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, physical_device: vk::PhysicalDevice, device: ash::Device, @@ -123,7 +123,7 @@ impl VulkanApp { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -185,7 +185,7 @@ impl VulkanApp { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, physical_device, device, @@ -626,7 +626,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/18_vertex_buffer.rs b/src/tutorials/18_vertex_buffer.rs index 2bc026b..5ee0124 100644 --- a/src/tutorials/18_vertex_buffer.rs +++ b/src/tutorials/18_vertex_buffer.rs @@ -76,7 +76,7 @@ struct VulkanApp { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, physical_device: vk::PhysicalDevice, device: ash::Device, @@ -126,7 +126,7 @@ impl VulkanApp { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -191,7 +191,7 @@ impl VulkanApp { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, physical_device, device, @@ -815,7 +815,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/19_staging_buffer.rs b/src/tutorials/19_staging_buffer.rs index 5af44a2..33d8b01 100644 --- a/src/tutorials/19_staging_buffer.rs +++ b/src/tutorials/19_staging_buffer.rs @@ -76,7 +76,7 @@ struct VulkanApp { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, physical_device: vk::PhysicalDevice, device: ash::Device, @@ -126,7 +126,7 @@ impl VulkanApp { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -196,7 +196,7 @@ impl VulkanApp { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, physical_device, device, @@ -931,7 +931,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/20_index_buffer.rs b/src/tutorials/20_index_buffer.rs index 21e384f..21adcc7 100644 --- a/src/tutorials/20_index_buffer.rs +++ b/src/tutorials/20_index_buffer.rs @@ -81,7 +81,7 @@ struct VulkanApp { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, physical_device: vk::PhysicalDevice, device: ash::Device, @@ -133,7 +133,7 @@ impl VulkanApp { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -211,7 +211,7 @@ impl VulkanApp { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, physical_device, device, @@ -877,7 +877,7 @@ impl Drop for VulkanApp { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/21_descriptor_layout.rs b/src/tutorials/21_descriptor_layout.rs index 771d407..3ed4230 100644 --- a/src/tutorials/21_descriptor_layout.rs +++ b/src/tutorials/21_descriptor_layout.rs @@ -35,7 +35,7 @@ struct VulkanApp21 { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, physical_device: vk::PhysicalDevice, device: ash::Device, @@ -91,7 +91,7 @@ impl VulkanApp21 { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -178,7 +178,7 @@ impl VulkanApp21 { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, physical_device, device, @@ -654,7 +654,7 @@ impl Drop for VulkanApp21 { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/22_descriptor_sets.rs b/src/tutorials/22_descriptor_sets.rs index 468886a..b393981 100644 --- a/src/tutorials/22_descriptor_sets.rs +++ b/src/tutorials/22_descriptor_sets.rs @@ -35,7 +35,7 @@ struct VulkanApp22 { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, physical_device: vk::PhysicalDevice, device: ash::Device, @@ -95,7 +95,7 @@ impl VulkanApp22 { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -193,7 +193,7 @@ impl VulkanApp22 { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, physical_device, device, @@ -771,7 +771,7 @@ impl Drop for VulkanApp22 { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/23_texture_image.rs b/src/tutorials/23_texture_image.rs index 9846d90..d2ba330 100644 --- a/src/tutorials/23_texture_image.rs +++ b/src/tutorials/23_texture_image.rs @@ -30,7 +30,7 @@ struct VulkanApp23 { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, physical_device: vk::PhysicalDevice, device: ash::Device, @@ -93,7 +93,7 @@ impl VulkanApp23 { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -198,7 +198,7 @@ impl VulkanApp23 { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, physical_device, device, @@ -998,7 +998,7 @@ impl Drop for VulkanApp23 { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/24_sampler.rs b/src/tutorials/24_sampler.rs index b697677..f839716 100644 --- a/src/tutorials/24_sampler.rs +++ b/src/tutorials/24_sampler.rs @@ -30,7 +30,7 @@ struct VulkanApp24 { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, physical_device: vk::PhysicalDevice, device: ash::Device, @@ -95,7 +95,7 @@ impl VulkanApp24 { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -202,7 +202,7 @@ impl VulkanApp24 { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, physical_device, device, @@ -838,7 +838,7 @@ impl Drop for VulkanApp24 { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/25_texture_mapping.rs b/src/tutorials/25_texture_mapping.rs index 6c67cc3..8ec8ce4 100644 --- a/src/tutorials/25_texture_mapping.rs +++ b/src/tutorials/25_texture_mapping.rs @@ -92,7 +92,7 @@ struct VulkanApp25 { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, physical_device: vk::PhysicalDevice, device: ash::Device, @@ -157,7 +157,7 @@ impl VulkanApp25 { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -266,7 +266,7 @@ impl VulkanApp25 { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, physical_device, device, @@ -874,7 +874,7 @@ impl Drop for VulkanApp25 { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/26_depth_buffering.rs b/src/tutorials/26_depth_buffering.rs index 7ce40e9..2605cd1 100644 --- a/src/tutorials/26_depth_buffering.rs +++ b/src/tutorials/26_depth_buffering.rs @@ -114,7 +114,7 @@ struct VulkanApp26 { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, physical_device: vk::PhysicalDevice, memory_properties: vk::PhysicalDeviceMemoryProperties, @@ -184,7 +184,7 @@ impl VulkanApp26 { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -309,7 +309,7 @@ impl VulkanApp26 { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, physical_device, memory_properties: physical_device_memory_properties, @@ -993,7 +993,7 @@ impl Drop for VulkanApp26 { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/27_model_loading.rs b/src/tutorials/27_model_loading.rs index 0545468..c6b262e 100644 --- a/src/tutorials/27_model_loading.rs +++ b/src/tutorials/27_model_loading.rs @@ -71,7 +71,7 @@ struct VulkanApp27 { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, physical_device: vk::PhysicalDevice, memory_properties: vk::PhysicalDeviceMemoryProperties, @@ -144,7 +144,7 @@ impl VulkanApp27 { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -271,7 +271,7 @@ impl VulkanApp27 { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, physical_device, memory_properties: physical_device_memory_properties, @@ -912,7 +912,7 @@ impl Drop for VulkanApp27 { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/28_mipmapping.rs b/src/tutorials/28_mipmapping.rs index 148c047..6462bb6 100644 --- a/src/tutorials/28_mipmapping.rs +++ b/src/tutorials/28_mipmapping.rs @@ -32,7 +32,7 @@ struct VulkanApp28 { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, physical_device: vk::PhysicalDevice, memory_properties: vk::PhysicalDeviceMemoryProperties, @@ -106,7 +106,7 @@ impl VulkanApp28 { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -235,7 +235,7 @@ impl VulkanApp28 { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, physical_device, memory_properties: physical_device_memory_properties, @@ -1132,7 +1132,7 @@ impl Drop for VulkanApp28 { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); } diff --git a/src/tutorials/29_multisampling.rs b/src/tutorials/29_multisampling.rs index ebab8a2..00f7ecd 100644 --- a/src/tutorials/29_multisampling.rs +++ b/src/tutorials/29_multisampling.rs @@ -31,7 +31,7 @@ struct VulkanApp29 { surface_loader: ash::extensions::khr::Surface, surface: vk::SurfaceKHR, debug_utils_loader: ash::extensions::ext::DebugUtils, - debug_merssager: vk::DebugUtilsMessengerEXT, + debug_messenger: vk::DebugUtilsMessengerEXT, physical_device: vk::PhysicalDevice, memory_properties: vk::PhysicalDeviceMemoryProperties, @@ -111,7 +111,7 @@ impl VulkanApp29 { ); let surface_stuff = share::create_surface(&entry, &instance, &window, WINDOW_WIDTH, WINDOW_HEIGHT); - let (debug_utils_loader, debug_merssager) = + let (debug_utils_loader, debug_messenger) = setup_debug_utils(VALIDATION.is_enable, &entry, &instance); let physical_device = share::pick_physical_device(&instance, &surface_stuff, &DEVICE_EXTENSIONS); @@ -252,7 +252,7 @@ impl VulkanApp29 { surface: surface_stuff.surface, surface_loader: surface_stuff.surface_loader, debug_utils_loader, - debug_merssager, + debug_messenger, physical_device, memory_properties: physical_device_memory_properties, @@ -1092,7 +1092,7 @@ impl Drop for VulkanApp29 { if VALIDATION.is_enable { self.debug_utils_loader - .destroy_debug_utils_messenger(self.debug_merssager, None); + .destroy_debug_utils_messenger(self.debug_messenger, None); } self.instance.destroy_instance(None); }