Refactor to split app/library
This commit is contained in:
parent
424be52645
commit
34fb477871
128
src/app.rs
128
src/app.rs
@ -1,103 +1,11 @@
|
|||||||
use anyhow::{anyhow, Result};
|
use crate::create_instance;
|
||||||
use log::*;
|
use crate::VALIDATION_ENABLED;
|
||||||
use std::collections::HashSet;
|
use ::anyhow::{anyhow, Result};
|
||||||
use std::ffi::CStr;
|
use ::thiserror::Error;
|
||||||
use std::os::raw::c_void;
|
use ::vulkanalia::loader::{LibloadingLoader, LIBRARY};
|
||||||
use vulkanalia::loader::{LibloadingLoader, LIBRARY};
|
use ::vulkanalia::prelude::v1_0::*;
|
||||||
use vulkanalia::prelude::v1_0::*;
|
use ::vulkanalia::vk::ExtDebugUtilsExtension;
|
||||||
use vulkanalia::vk::ExtDebugUtilsExtension;
|
use ::winit::window::Window;
|
||||||
use vulkanalia::window as vk_window;
|
|
||||||
use winit::window::Window;
|
|
||||||
|
|
||||||
const VALIDATION_ENABLED: bool = cfg!(debug_assertions);
|
|
||||||
const VALIDATION_LAYER: vk::ExtensionName =
|
|
||||||
vk::ExtensionName::from_bytes(b"VK_LAYER_KHRONOS_validation");
|
|
||||||
|
|
||||||
extern "system" fn debug_callback(
|
|
||||||
severity: vk::DebugUtilsMessageSeverityFlagsEXT,
|
|
||||||
type_: vk::DebugUtilsMessageTypeFlagsEXT,
|
|
||||||
data: *const vk::DebugUtilsMessengerCallbackDataEXT,
|
|
||||||
_: *mut c_void,
|
|
||||||
) -> vk::Bool32 {
|
|
||||||
let data = unsafe { *data };
|
|
||||||
let message = unsafe { CStr::from_ptr(data.message) }.to_string_lossy();
|
|
||||||
|
|
||||||
if severity >= vk::DebugUtilsMessageSeverityFlagsEXT::ERROR {
|
|
||||||
error!("({:?}) {}", type_, message);
|
|
||||||
} else if severity >= vk::DebugUtilsMessageSeverityFlagsEXT::WARNING {
|
|
||||||
warn!("({:?}) {}", type_, message);
|
|
||||||
} else if severity >= vk::DebugUtilsMessageSeverityFlagsEXT::INFO {
|
|
||||||
debug!("({:?}) {}", type_, message);
|
|
||||||
} else {
|
|
||||||
trace!("({:?}) {}", type_, message);
|
|
||||||
}
|
|
||||||
|
|
||||||
vk::FALSE
|
|
||||||
}
|
|
||||||
|
|
||||||
unsafe fn create_instance(window: &Window, entry: &Entry, data: &mut AppData) -> Result<Instance> {
|
|
||||||
let application_info = vk::ApplicationInfo::builder()
|
|
||||||
.application_name(b"Vulkan Tutorial\0")
|
|
||||||
.application_version(vk::make_version(1, 0, 0))
|
|
||||||
.engine_name(b"No Engine\0")
|
|
||||||
.engine_version(vk::make_version(1, 0, 0))
|
|
||||||
.api_version(vk::make_version(1, 0, 0));
|
|
||||||
|
|
||||||
let available_layers = entry
|
|
||||||
.enumerate_instance_layer_properties()?
|
|
||||||
.iter()
|
|
||||||
.map(|l| l.layer_name)
|
|
||||||
.collect::<HashSet<_>>();
|
|
||||||
|
|
||||||
if VALIDATION_ENABLED && !available_layers.contains(&VALIDATION_LAYER) {
|
|
||||||
return Err(anyhow!("Validation layer requested but not supported."));
|
|
||||||
}
|
|
||||||
|
|
||||||
let layers = if VALIDATION_ENABLED {
|
|
||||||
vec![VALIDATION_LAYER.as_ptr()]
|
|
||||||
} else {
|
|
||||||
Vec::new()
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut extensions = vk_window::get_required_instance_extensions(window)
|
|
||||||
.iter()
|
|
||||||
.map(|e| e.as_ptr())
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
if VALIDATION_ENABLED {
|
|
||||||
extensions.push(vk::EXT_DEBUG_UTILS_EXTENSION.name.as_ptr());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Compatibility extension for macOS
|
|
||||||
let flags = if entry
|
|
||||||
.enumerate_instance_extension_properties(None)?
|
|
||||||
.iter()
|
|
||||||
.any(|e| e.extension_name == vk::KHR_PORTABILITY_ENUMERATION_EXTENSION.name)
|
|
||||||
{
|
|
||||||
extensions.push(vk::KHR_PORTABILITY_ENUMERATION_EXTENSION.name.as_ptr());
|
|
||||||
vk::InstanceCreateFlags::ENUMERATE_PORTABILITY_KHR
|
|
||||||
} else {
|
|
||||||
vk::InstanceCreateFlags::empty()
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut info = vk::InstanceCreateInfo::builder()
|
|
||||||
.application_info(&application_info)
|
|
||||||
.enabled_layer_names(&layers)
|
|
||||||
.enabled_extension_names(&extensions)
|
|
||||||
.flags(flags);
|
|
||||||
|
|
||||||
let mut debug_info = vk::DebugUtilsMessengerCreateInfoEXT::builder()
|
|
||||||
.message_severity(vk::DebugUtilsMessageSeverityFlagsEXT::all())
|
|
||||||
.message_type(vk::DebugUtilsMessageTypeFlagsEXT::all())
|
|
||||||
.user_callback(Some(debug_callback));
|
|
||||||
|
|
||||||
if VALIDATION_ENABLED {
|
|
||||||
info = info.push_next(&mut debug_info);
|
|
||||||
}
|
|
||||||
|
|
||||||
let instance = entry.create_instance(&info, None)?;
|
|
||||||
|
|
||||||
Ok(instance)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Our Vulkan app.
|
/// Our Vulkan app.
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
@ -115,7 +23,12 @@ impl App {
|
|||||||
let mut data = AppData::default();
|
let mut data = AppData::default();
|
||||||
let instance = create_instance(window, &entry, &mut data)?;
|
let instance = create_instance(window, &entry, &mut data)?;
|
||||||
|
|
||||||
Ok(Self { entry, instance, data })
|
pick_physical_device(&instance, &mut data)?;
|
||||||
|
Ok(Self {
|
||||||
|
entry,
|
||||||
|
instance,
|
||||||
|
data,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Renders a frame for our Vulkan app.
|
/// Renders a frame for our Vulkan app.
|
||||||
@ -126,7 +39,8 @@ impl App {
|
|||||||
/// Destroys our Vulkan app.
|
/// Destroys our Vulkan app.
|
||||||
pub unsafe fn destroy(&mut self) {
|
pub unsafe fn destroy(&mut self) {
|
||||||
if VALIDATION_ENABLED {
|
if VALIDATION_ENABLED {
|
||||||
self.instance.destroy_debug_utils_messenger_ext(self.data.messenger, None);
|
self.instance
|
||||||
|
.destroy_debug_utils_messenger_ext(self.data.messenger, None);
|
||||||
}
|
}
|
||||||
|
|
||||||
self.instance.destroy_instance(None);
|
self.instance.destroy_instance(None);
|
||||||
@ -135,6 +49,14 @@ impl App {
|
|||||||
|
|
||||||
/// The Vulkan handles and associated properties used by our Vulkan app.
|
/// The Vulkan handles and associated properties used by our Vulkan app.
|
||||||
#[derive(Clone, Debug, Default)]
|
#[derive(Clone, Debug, Default)]
|
||||||
struct AppData {
|
pub struct AppData {
|
||||||
messenger: vk::DebugUtilsMessengerEXT,
|
messenger: vk::DebugUtilsMessengerEXT,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Error)]
|
||||||
|
#[error("Missing {0}.")]
|
||||||
|
pub struct SuitabilityError(pub &'static str);
|
||||||
|
|
||||||
|
unsafe fn pick_physical_device(instance: &Instance, data: &mut AppData) -> Result<()> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
110
src/lib.rs
Normal file
110
src/lib.rs
Normal file
@ -0,0 +1,110 @@
|
|||||||
|
mod app;
|
||||||
|
pub use app::App;
|
||||||
|
use app::AppData;
|
||||||
|
|
||||||
|
use ::anyhow::{anyhow, Result};
|
||||||
|
use ::log::*;
|
||||||
|
use ::std::collections::HashSet;
|
||||||
|
use ::std::ffi::CStr;
|
||||||
|
use ::std::os::raw::c_void;
|
||||||
|
use ::vulkanalia::prelude::v1_0::*;
|
||||||
|
use ::vulkanalia::window as vk_window;
|
||||||
|
use ::winit::window::Window;
|
||||||
|
|
||||||
|
pub const VALIDATION_ENABLED: bool = cfg!(debug_assertions);
|
||||||
|
pub const VALIDATION_LAYER: vk::ExtensionName =
|
||||||
|
vk::ExtensionName::from_bytes(b"VK_LAYER_KHRONOS_validation");
|
||||||
|
|
||||||
|
pub fn create_app(window: &Window) -> Result<App> {
|
||||||
|
Ok(unsafe { App::create(&window)? })
|
||||||
|
}
|
||||||
|
|
||||||
|
extern "system" fn debug_callback(
|
||||||
|
severity: vk::DebugUtilsMessageSeverityFlagsEXT,
|
||||||
|
type_: vk::DebugUtilsMessageTypeFlagsEXT,
|
||||||
|
data: *const vk::DebugUtilsMessengerCallbackDataEXT,
|
||||||
|
_: *mut c_void,
|
||||||
|
) -> vk::Bool32 {
|
||||||
|
let data = unsafe { *data };
|
||||||
|
let message = unsafe { CStr::from_ptr(data.message) }.to_string_lossy();
|
||||||
|
|
||||||
|
if severity >= vk::DebugUtilsMessageSeverityFlagsEXT::ERROR {
|
||||||
|
error!("({:?}) {}", type_, message);
|
||||||
|
} else if severity >= vk::DebugUtilsMessageSeverityFlagsEXT::WARNING {
|
||||||
|
warn!("({:?}) {}", type_, message);
|
||||||
|
} else if severity >= vk::DebugUtilsMessageSeverityFlagsEXT::INFO {
|
||||||
|
debug!("({:?}) {}", type_, message);
|
||||||
|
} else {
|
||||||
|
trace!("({:?}) {}", type_, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
vk::FALSE
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) unsafe fn create_instance(
|
||||||
|
window: &Window,
|
||||||
|
entry: &Entry,
|
||||||
|
data: &mut AppData,
|
||||||
|
) -> Result<Instance> {
|
||||||
|
let application_info = vk::ApplicationInfo::builder()
|
||||||
|
.application_name(b"Vulkan Tutorial\0")
|
||||||
|
.application_version(vk::make_version(1, 0, 0))
|
||||||
|
.engine_name(b"No Engine\0")
|
||||||
|
.engine_version(vk::make_version(1, 0, 0))
|
||||||
|
.api_version(vk::make_version(1, 0, 0));
|
||||||
|
|
||||||
|
let available_layers = entry
|
||||||
|
.enumerate_instance_layer_properties()?
|
||||||
|
.iter()
|
||||||
|
.map(|l| l.layer_name)
|
||||||
|
.collect::<HashSet<_>>();
|
||||||
|
|
||||||
|
if VALIDATION_ENABLED && !available_layers.contains(&VALIDATION_LAYER) {
|
||||||
|
return Err(anyhow!("Validation layer requested but not supported."));
|
||||||
|
}
|
||||||
|
|
||||||
|
let layers = if VALIDATION_ENABLED {
|
||||||
|
vec![VALIDATION_LAYER.as_ptr()]
|
||||||
|
} else {
|
||||||
|
Vec::new()
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut extensions = vk_window::get_required_instance_extensions(window)
|
||||||
|
.iter()
|
||||||
|
.map(|e| e.as_ptr())
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
if VALIDATION_ENABLED {
|
||||||
|
extensions.push(vk::EXT_DEBUG_UTILS_EXTENSION.name.as_ptr());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Compatibility extension for macOS
|
||||||
|
let flags = if entry
|
||||||
|
.enumerate_instance_extension_properties(None)?
|
||||||
|
.iter()
|
||||||
|
.any(|e| e.extension_name == vk::KHR_PORTABILITY_ENUMERATION_EXTENSION.name)
|
||||||
|
{
|
||||||
|
extensions.push(vk::KHR_PORTABILITY_ENUMERATION_EXTENSION.name.as_ptr());
|
||||||
|
vk::InstanceCreateFlags::ENUMERATE_PORTABILITY_KHR
|
||||||
|
} else {
|
||||||
|
vk::InstanceCreateFlags::empty()
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut info = vk::InstanceCreateInfo::builder()
|
||||||
|
.application_info(&application_info)
|
||||||
|
.enabled_layer_names(&layers)
|
||||||
|
.enabled_extension_names(&extensions)
|
||||||
|
.flags(flags);
|
||||||
|
|
||||||
|
let mut debug_info = vk::DebugUtilsMessengerCreateInfoEXT::builder()
|
||||||
|
.message_severity(vk::DebugUtilsMessageSeverityFlagsEXT::all())
|
||||||
|
.message_type(vk::DebugUtilsMessageTypeFlagsEXT::all())
|
||||||
|
.user_callback(Some(debug_callback));
|
||||||
|
|
||||||
|
if VALIDATION_ENABLED {
|
||||||
|
info = info.push_next(&mut debug_info);
|
||||||
|
}
|
||||||
|
|
||||||
|
let instance = entry.create_instance(&info, None)?;
|
||||||
|
|
||||||
|
Ok(instance)
|
||||||
|
}
|
22
src/main.rs
22
src/main.rs
@ -1,18 +1,10 @@
|
|||||||
// #![allow(
|
use ::anyhow::Result;
|
||||||
// dead_code,
|
use ::winit::dpi::LogicalSize;
|
||||||
// unused_variables,
|
use ::winit::event::{Event, WindowEvent};
|
||||||
// clippy::too_many_arguments,
|
use ::winit::event_loop::{ControlFlow, EventLoop};
|
||||||
// clippy::unnecessary_wraps
|
use ::winit::window::WindowBuilder;
|
||||||
// )]
|
|
||||||
|
|
||||||
mod app;
|
use vulkan_tutorial::create_app;
|
||||||
use app::App;
|
|
||||||
|
|
||||||
use anyhow::Result;
|
|
||||||
use winit::dpi::LogicalSize;
|
|
||||||
use winit::event::{Event, WindowEvent};
|
|
||||||
use winit::event_loop::{ControlFlow, EventLoop};
|
|
||||||
use winit::window::WindowBuilder;
|
|
||||||
|
|
||||||
fn main() -> Result<()> {
|
fn main() -> Result<()> {
|
||||||
pretty_env_logger::init();
|
pretty_env_logger::init();
|
||||||
@ -25,7 +17,7 @@ fn main() -> Result<()> {
|
|||||||
.build(&event_loop)?;
|
.build(&event_loop)?;
|
||||||
|
|
||||||
// App
|
// App
|
||||||
let mut app = unsafe { App::create(&window)? };
|
let mut app = create_app(&window)?;
|
||||||
let mut destroying = false;
|
let mut destroying = false;
|
||||||
event_loop.run(move |event, _, control_flow| {
|
event_loop.run(move |event, _, control_flow| {
|
||||||
*control_flow = ControlFlow::Poll;
|
*control_flow = ControlFlow::Poll;
|
||||||
|
Loading…
Reference in New Issue
Block a user