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

Ignore #75 and #84 since it's cosmetic only

Browse source
This commit is contained in:
Tim 2018-07-31 14:31:52 +02:00
parent 338ed956d2
commit 1b5f2b105c
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
examples/src/bin/texture.rs
View file

@ -66,7 +66,7 @@ fn main() {
}; };
let dependency = vk::SubpassDependency { let dependency = vk::SubpassDependency {
dependency_flags: Default::default(), dependency_flags: Default::default(),
src_subpass: vk::SUBPASS_EXTERNAL, src_subpass: vk::VK_SUBPASS_EXTERNAL,
dst_subpass: Default::default(), dst_subpass: Default::default(),
src_stage_mask: vk::PipelineStageFlags::COLOR_ATTACHMENT_OUTPUT, src_stage_mask: vk::PipelineStageFlags::COLOR_ATTACHMENT_OUTPUT,
src_access_mask: Default::default(), src_access_mask: Default::default(),
@ -401,8 +401,8 @@ fn main() {
dst_access_mask: vk::AccessFlags::TRANSFER_WRITE, dst_access_mask: vk::AccessFlags::TRANSFER_WRITE,
old_layout: vk::ImageLayout::UNDEFINED, old_layout: vk::ImageLayout::UNDEFINED,
new_layout: vk::ImageLayout::TRANSFER_DST_OPTIMAL, new_layout: vk::ImageLayout::TRANSFER_DST_OPTIMAL,
src_queue_family_index: vk::QUEUE_FAMILY_IGNORED, src_queue_family_index: vk::VK_QUEUE_FAMILY_IGNORED,
dst_queue_family_index: vk::QUEUE_FAMILY_IGNORED, dst_queue_family_index: vk::VK_QUEUE_FAMILY_IGNORED,
image: texture_image, image: texture_image,
subresource_range: vk::ImageSubresourceRange { subresource_range: vk::ImageSubresourceRange {
aspect_mask: vk::ImageAspectFlags::COLOR, aspect_mask: vk::ImageAspectFlags::COLOR,
@ -455,8 +455,8 @@ fn main() {
dst_access_mask: vk::AccessFlags::SHADER_READ, dst_access_mask: vk::AccessFlags::SHADER_READ,
old_layout: vk::ImageLayout::TRANSFER_DST_OPTIMAL, old_layout: vk::ImageLayout::TRANSFER_DST_OPTIMAL,
new_layout: vk::ImageLayout::SHADER_READ_ONLY_OPTIMAL, new_layout: vk::ImageLayout::SHADER_READ_ONLY_OPTIMAL,
src_queue_family_index: vk::QUEUE_FAMILY_IGNORED, src_queue_family_index: vk::VK_QUEUE_FAMILY_IGNORED,
dst_queue_family_index: vk::QUEUE_FAMILY_IGNORED, dst_queue_family_index: vk::VK_QUEUE_FAMILY_IGNORED,
image: texture_image, image: texture_image,
subresource_range: vk::ImageSubresourceRange { subresource_range: vk::ImageSubresourceRange {
aspect_mask: vk::ImageAspectFlags::COLOR, aspect_mask: vk::ImageAspectFlags::COLOR,

2
examples/src/bin/triangle.rs
View file

@ -57,7 +57,7 @@ fn main() {
}; };
let dependency = vk::SubpassDependency { let dependency = vk::SubpassDependency {
dependency_flags: Default::default(), dependency_flags: Default::default(),
src_subpass: vk::SUBPASS_EXTERNAL, src_subpass: vk::VK_SUBPASS_EXTERNAL,
dst_subpass: Default::default(), dst_subpass: Default::default(),
src_stage_mask: vk::PipelineStageFlags::COLOR_ATTACHMENT_OUTPUT, src_stage_mask: vk::PipelineStageFlags::COLOR_ATTACHMENT_OUTPUT,
src_access_mask: Default::default(), src_access_mask: Default::default(),

18
examples/src/lib.rs
View file

@ -303,8 +303,8 @@ impl ExampleBase {
let debug_info = vk::DebugReportCallbackCreateInfoEXT { let debug_info = vk::DebugReportCallbackCreateInfoEXT {
s_type: vk::StructureType::DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT, s_type: vk::StructureType::DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT,
p_next: ptr::null(), p_next: ptr::null(),
flags: vk::DebugReportFlagsEXT::ERROR | vk::DebugReportFlagsEXT::WARNING flags: vk::DebugReportFlagsEXT::ERROR_EXT | vk::DebugReportFlagsEXT::WARNING_EXT
| vk::DebugReportFlagsEXT::PERFORMANCE_WARNING, | vk::DebugReportFlagsEXT::PERFORMANCE_WARNING_EXT,
pfn_callback: vulkan_debug_callback, pfn_callback: vulkan_debug_callback,
p_user_data: ptr::null_mut(), p_user_data: ptr::null_mut(),
}; };
@ -408,9 +408,9 @@ impl ExampleBase {
}; };
let pre_transform = if surface_capabilities let pre_transform = if surface_capabilities
.supported_transforms .supported_transforms
.subset(vk::SurfaceTransformFlagsKHR::IDENTITY) .subset(vk::SurfaceTransformFlagsKHR::IDENTITY_KHR)
{ {
vk::SurfaceTransformFlagsKHR::IDENTITY vk::SurfaceTransformFlagsKHR::IDENTITY_KHR
} else { } else {
surface_capabilities.current_transform surface_capabilities.current_transform
}; };
@ -420,8 +420,8 @@ impl ExampleBase {
let present_mode = present_modes let present_mode = present_modes
.iter() .iter()
.cloned() .cloned()
.find(|&mode| mode == vk::PresentModeKHR::MAILBOX) .find(|&mode| mode == vk::PresentModeKHR::MAILBOX_KHR)
.unwrap_or(vk::PresentModeKHR::FIFO); .unwrap_or(vk::PresentModeKHR::FIFO_KHR);
let swapchain_loader = let swapchain_loader =
Swapchain::new(&instance, &device).expect("Unable to load swapchain"); Swapchain::new(&instance, &device).expect("Unable to load swapchain");
let swapchain_create_info = vk::SwapchainCreateInfoKHR { let swapchain_create_info = vk::SwapchainCreateInfoKHR {
@ -436,7 +436,7 @@ impl ExampleBase {
image_usage: vk::ImageUsageFlags::COLOR_ATTACHMENT, image_usage: vk::ImageUsageFlags::COLOR_ATTACHMENT,
image_sharing_mode: vk::SharingMode::EXCLUSIVE, image_sharing_mode: vk::SharingMode::EXCLUSIVE,
pre_transform: pre_transform, pre_transform: pre_transform,
composite_alpha: vk::CompositeAlphaFlagsKHR::OPAQUE, composite_alpha: vk::CompositeAlphaFlagsKHR::OPAQUE_KHR,
present_mode: present_mode, present_mode: present_mode,
clipped: 1, clipped: 1,
old_swapchain: vk::SwapchainKHR::null(), old_swapchain: vk::SwapchainKHR::null(),
@ -556,8 +556,8 @@ impl ExampleBase {
| vk::AccessFlags::DEPTH_STENCIL_ATTACHMENT_WRITE, | vk::AccessFlags::DEPTH_STENCIL_ATTACHMENT_WRITE,
old_layout: vk::ImageLayout::UNDEFINED, old_layout: vk::ImageLayout::UNDEFINED,
new_layout: vk::ImageLayout::DEPTH_STENCIL_ATTACHMENT_OPTIMAL, new_layout: vk::ImageLayout::DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
src_queue_family_index: vk::QUEUE_FAMILY_IGNORED, src_queue_family_index: vk::VK_QUEUE_FAMILY_IGNORED,
dst_queue_family_index: vk::QUEUE_FAMILY_IGNORED, dst_queue_family_index: vk::VK_QUEUE_FAMILY_IGNORED,
image: depth_image, image: depth_image,
subresource_range: vk::ImageSubresourceRange { subresource_range: vk::ImageSubresourceRange {
aspect_mask: vk::ImageAspectFlags::DEPTH, aspect_mask: vk::ImageAspectFlags::DEPTH,