alex/ash
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

refactored examples/src/lib.rs to use builders

Browse source
This commit is contained in:
colin 2018-12-06 21:53:53 -06:00
parent cf60417ecc
commit 8c2424c836
1 changed files with 54 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
examples/src/lib.rs
View file

@ -117,8 +117,8 @@ pub fn record_submit_commandbuffer<D: DeviceV1_0, F: FnOnce(&D, vk::CommandBuffe
command_buffer, command_buffer,
vk::CommandBufferResetFlags::RELEASE_RESOURCES, vk::CommandBufferResetFlags::RELEASE_RESOURCES,
).expect("Reset command buffer failed."); ).expect("Reset command buffer failed.");
let command_buffer_begin_info = vk::CommandBufferBeginInfo::builder()
let command_buffer_begin_info = vk::CommandBufferBeginInfo::default(); .flags(vk::CommandBufferUsageFlags::ONE_TIME_SUBMIT);
device device
.begin_command_buffer(command_buffer, &command_buffer_begin_info) .begin_command_buffer(command_buffer, &command_buffer_begin_info)
@ -134,11 +134,12 @@ pub fn record_submit_commandbuffer<D: DeviceV1_0, F: FnOnce(&D, vk::CommandBuffe
.create_fence(&fence_create_info, None) .create_fence(&fence_create_info, None)
.expect("Create fence failed."); .expect("Create fence failed.");
let command_buffers = vec![command_buffer];
let submit_info = vk::SubmitInfo::builder() let submit_info = vk::SubmitInfo::builder()
.wait_semaphores(wait_semaphores) .wait_semaphores(wait_semaphores)
.command_buffers(&[command_buffer])
.signal_semaphores(signal_semaphores)
.wait_dst_stage_mask(wait_mask) .wait_dst_stage_mask(wait_mask)
.command_buffers(&command_buffers)
.signal_semaphores(signal_semaphores)
.build(); .build();
device device
@ -161,9 +162,9 @@ unsafe fn create_surface<E: EntryV1_0, I: InstanceV1_0>(
let x11_display = window.get_xlib_display().unwrap(); let x11_display = window.get_xlib_display().unwrap();
let x11_window = window.get_xlib_window().unwrap(); let x11_window = window.get_xlib_window().unwrap();
let x11_create_info = vk::XlibSurfaceCreateInfoKHR::builder() let x11_create_info = vk::XlibSurfaceCreateInfoKHR::builder()
.window(x11_window as vk::Window) .window(x11_window)
.dpy(x11_display as *mut vk::Display) .dpy(x11_display as *mut vk::Display);
.build();
let xlib_surface_loader = XlibSurface::new(entry, instance); let xlib_surface_loader = XlibSurface::new(entry, instance);
xlib_surface_loader.create_xlib_surface(&x11_create_info, None) xlib_surface_loader.create_xlib_surface(&x11_create_info, None)
} }
@ -400,12 +401,11 @@ impl ExampleBase {
.expect("Instance creation error"); .expect("Instance creation error");
let debug_info = vk::DebugReportCallbackCreateInfoEXT::builder() let debug_info = vk::DebugReportCallbackCreateInfoEXT::builder()
.pfn_callback(Some(vulkan_debug_callback))
.flags( .flags(
vk::DebugReportFlagsEXT::ERROR vk::DebugReportFlagsEXT::ERROR
| vk::DebugReportFlagsEXT::WARNING | vk::DebugReportFlagsEXT::WARNING
| vk::DebugReportFlagsEXT::PERFORMANCE_WARNING, | vk::DebugReportFlagsEXT::PERFORMANCE_WARNING)
).build(); .pfn_callback(Some(vulkan_debug_callback));
let debug_report_loader = DebugReport::new(&entry, &instance); let debug_report_loader = DebugReport::new(&entry, &instance);
let debug_call_back = debug_report_loader let debug_call_back = debug_report_loader
@ -447,16 +447,15 @@ impl ExampleBase {
}; };
let priorities = [1.0]; let priorities = [1.0];
let queue_info = vk::DeviceQueueCreateInfo::builder() let queue_info = [vk::DeviceQueueCreateInfo::builder()
.queue_family_index(queue_family_index as u32) .queue_family_index(queue_family_index)
.queue_priorities(&priorities) .queue_priorities(&priorities)
.build(); .build()];
let device_create_info = vk::DeviceCreateInfo::builder() let device_create_info = vk::DeviceCreateInfo::builder()
.queue_create_infos(&[queue_info]) .queue_create_infos(&queue_info)
.enabled_extension_names(&device_extension_names_raw) .enabled_extension_names(&device_extension_names_raw)
.enabled_features(&features) .enabled_features(&features);
.build();
let device: Device = instance let device: Device = instance
.create_device(pdevice, &device_create_info, None) .create_device(pdevice, &device_create_info, None)
@ -512,33 +511,32 @@ impl ExampleBase {
let swapchain_create_info = vk::SwapchainCreateInfoKHR::builder() let swapchain_create_info = vk::SwapchainCreateInfoKHR::builder()
.surface(surface) .surface(surface)
.min_image_count(desired_image_count) .min_image_count( desired_image_count)
.image_color_space(surface_format.color_space) .image_color_space( surface_format.color_space)
.image_format(surface_format.format) .image_format( surface_format.format)
.image_extent(surface_resolution.clone()) .image_extent( surface_resolution.clone())
.image_usage(vk::ImageUsageFlags::COLOR_ATTACHMENT) .image_usage( vk::ImageUsageFlags::COLOR_ATTACHMENT)
.pre_transform(pre_transform) .image_sharing_mode(vk::SharingMode::EXCLUSIVE)
.composite_alpha(vk::CompositeAlphaFlagsKHR::OPAQUE) .pre_transform( pre_transform)
.present_mode(present_mode) .composite_alpha( vk::CompositeAlphaFlagsKHR::OPAQUE)
// .clipped(true) .present_mode( present_mode)
.image_array_layers(1) .clipped(true)
.build(); .image_array_layers( 1);
let swapchain = swapchain_loader let swapchain = swapchain_loader
.create_swapchain(&swapchain_create_info, None) .create_swapchain(&swapchain_create_info, None)
.unwrap(); .unwrap();
let pool_create_info = vk::CommandPoolCreateInfo::builder() let pool_create_info = vk::CommandPoolCreateInfo::builder()
.queue_family_index(queue_family_index)
.flags(vk::CommandPoolCreateFlags::RESET_COMMAND_BUFFER) .flags(vk::CommandPoolCreateFlags::RESET_COMMAND_BUFFER)
.build(); .queue_family_index(queue_family_index);
let pool = device.create_command_pool(&pool_create_info, None).unwrap(); let pool = device.create_command_pool(&pool_create_info, None).unwrap();
let command_buffer_allocate_info = vk::CommandBufferAllocateInfo::builder() let command_buffer_allocate_info = vk::CommandBufferAllocateInfo::builder()
.command_buffer_count(2) .command_buffer_count(2)
.command_pool(pool) .command_pool(pool)
.level(vk::CommandBufferLevel::PRIMARY) .level(vk::CommandBufferLevel::PRIMARY);
.build();
let command_buffers = device let command_buffers = device
.allocate_command_buffers(&command_buffer_allocate_info) .allocate_command_buffers(&command_buffer_allocate_info)
@ -551,33 +549,39 @@ impl ExampleBase {
.iter() .iter()
.map(|&image| { .map(|&image| {
let create_view_info = vk::ImageViewCreateInfo::builder() let create_view_info = vk::ImageViewCreateInfo::builder()
.subresource_range( .view_type( vk::ImageViewType::TYPE_2D)
vk::ImageSubresourceRange::builder()
.aspect_mask(vk::ImageAspectFlags::COLOR)
.level_count(1)
.layer_count(1)
.build(),
).image(image)
.format(surface_format.format) .format(surface_format.format)
.view_type(vk::ImageViewType::TYPE_2D) .components( vk::ComponentMapping {
.build(); r: vk::ComponentSwizzle::R,
g: vk::ComponentSwizzle::G,
b: vk::ComponentSwizzle::B,
a: vk::ComponentSwizzle::A,
})
.subresource_range( vk::ImageSubresourceRange {
aspect_mask: vk::ImageAspectFlags::COLOR,
base_mip_level: 0,
level_count: 1,
base_array_layer: 0,
layer_count: 1,
})
.image( image);
device.create_image_view(&create_view_info, None).unwrap() device.create_image_view(&create_view_info, None).unwrap()
}).collect(); }).collect();
let device_memory_properties = instance.get_physical_device_memory_properties(pdevice); let device_memory_properties = instance.get_physical_device_memory_properties(pdevice);
let depth_image_create_info = vk::ImageCreateInfo::builder() let depth_image_create_info = vk::ImageCreateInfo::builder()
.image_type(vk::ImageType::TYPE_2D) .image_type( vk::ImageType::TYPE_2D)
.format(vk::Format::D16_UNORM) .format( vk::Format::D16_UNORM)
.extent(vk::Extent3D { .extent( vk::Extent3D {
width: surface_resolution.width, width: surface_resolution.width,
height: surface_resolution.height, height: surface_resolution.height,
depth: 1, depth: 1,
}).mip_levels(1) })
.array_layers(1) .mip_levels( 1)
.samples(vk::SampleCountFlags::TYPE_1) .array_layers( 1)
.samples( vk::SampleCountFlags::TYPE_1)
.tiling( vk::ImageTiling::OPTIMAL)
.usage(vk::ImageUsageFlags::DEPTH_STENCIL_ATTACHMENT) .usage(vk::ImageUsageFlags::DEPTH_STENCIL_ATTACHMENT)
.build(); .sharing_mode( vk::SharingMode::EXCLUSIVE);
let depth_image = device.create_image(&depth_image_create_info, None).unwrap(); let depth_image = device.create_image(&depth_image_create_info, None).unwrap();
let depth_image_memory_req = device.get_image_memory_requirements(depth_image); let depth_image_memory_req = device.get_image_memory_requirements(depth_image);