Skip to content

typo fix: merssager->messenger #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

typo fix: merssager->messenger #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/tutorials/02_validation_layers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -58,15 +58,15 @@ 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 {

_entry: entry,
instance,
debug_utils_loader,
debug_merssager,
debug_messenger,
}
}

Expand Down Expand Up @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions src/tutorials/03_physical_device_selection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand All @@ -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);

Expand All @@ -55,7 +55,7 @@ impl VulkanApp {
_entry: entry,
instance,
debug_utils_loader,
debug_merssager,
debug_messenger,
_physical_device: physical_device,
}
}
Expand Down Expand Up @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions src/tutorials/04_logical_device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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) =
Expand All @@ -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,
Expand Down Expand Up @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions src/tutorials/05_window_surface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);
Expand All @@ -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,
Expand Down Expand Up @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions src/tutorials/06_swap_chain_creation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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(
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions src/tutorials/07_image_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions src/tutorials/08_graphics_pipeline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions src/tutorials/09_shader_modules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions src/tutorials/10_fixed_functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions src/tutorials/11_render_passes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions src/tutorials/12_graphics_pipeline_complete.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}
Expand Down
Loading