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

Merge pull request #86 from Cyres/generator

Browse source 
Port of examples
This commit is contained in:
Maik Klein 2018-08-01 08:17:20 +02:00 committed by GitHub
parent 197b06b0d8 d9aa575318
commit 146e9857b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 497 additions and 459 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because it is too large Load diff

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

@ -2,17 +2,17 @@ extern crate ash;
#[macro_use] #[macro_use]
extern crate examples; extern crate examples;
use ash::util::*;
use ash::vk; use ash::vk;
use examples::*;
use std::default::Default; use std::default::Default;
use std::ptr;
use std::ffi::CString; use std::ffi::CString;
use std::mem;
use std::path::Path;
use std::fs::File; use std::fs::File;
use std::io::Read; use std::io::Read;
use examples::*; use std::mem;
use ash::util::*;
use std::mem::align_of; use std::mem::align_of;
use std::path::Path;
use std::ptr;
#[derive(Clone, Debug, Copy)] #[derive(Clone, Debug, Copy)]
struct Vertex { struct Vertex {
@ -27,50 +27,50 @@ fn main() {
vk::AttachmentDescription { vk::AttachmentDescription {
format: base.surface_format.format, format: base.surface_format.format,
flags: vk::AttachmentDescriptionFlags::empty(), flags: vk::AttachmentDescriptionFlags::empty(),
samples: vk::SAMPLE_COUNT_1_BIT, samples: vk::SampleCountFlags::TYPE_1,
load_op: vk::AttachmentLoadOp::Clear, load_op: vk::AttachmentLoadOp::CLEAR,
store_op: vk::AttachmentStoreOp::Store, store_op: vk::AttachmentStoreOp::STORE,
stencil_load_op: vk::AttachmentLoadOp::DontCare, stencil_load_op: vk::AttachmentLoadOp::DONT_CARE,
stencil_store_op: vk::AttachmentStoreOp::DontCare, stencil_store_op: vk::AttachmentStoreOp::DONT_CARE,
initial_layout: vk::ImageLayout::Undefined, initial_layout: vk::ImageLayout::UNDEFINED,
final_layout: vk::ImageLayout::PresentSrcKhr, final_layout: vk::ImageLayout::PRESENT_SRC_KHR,
}, },
vk::AttachmentDescription { vk::AttachmentDescription {
format: vk::Format::D16Unorm, format: vk::Format::D16_UNORM,
flags: vk::AttachmentDescriptionFlags::empty(), flags: vk::AttachmentDescriptionFlags::empty(),
samples: vk::SAMPLE_COUNT_1_BIT, samples: vk::SampleCountFlags::TYPE_1,
load_op: vk::AttachmentLoadOp::Clear, load_op: vk::AttachmentLoadOp::CLEAR,
store_op: vk::AttachmentStoreOp::DontCare, store_op: vk::AttachmentStoreOp::DONT_CARE,
stencil_load_op: vk::AttachmentLoadOp::DontCare, stencil_load_op: vk::AttachmentLoadOp::DONT_CARE,
stencil_store_op: vk::AttachmentStoreOp::DontCare, stencil_store_op: vk::AttachmentStoreOp::DONT_CARE,
initial_layout: vk::ImageLayout::DepthStencilAttachmentOptimal, initial_layout: vk::ImageLayout::DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
final_layout: vk::ImageLayout::DepthStencilAttachmentOptimal, final_layout: vk::ImageLayout::DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
}, },
]; ];
let color_attachment_ref = vk::AttachmentReference { let color_attachment_ref = vk::AttachmentReference {
attachment: 0, attachment: 0,
layout: vk::ImageLayout::ColorAttachmentOptimal, layout: vk::ImageLayout::COLOR_ATTACHMENT_OPTIMAL,
}; };
let depth_attachment_ref = vk::AttachmentReference { let depth_attachment_ref = vk::AttachmentReference {
attachment: 1, attachment: 1,
layout: vk::ImageLayout::DepthStencilAttachmentOptimal, layout: vk::ImageLayout::DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
}; };
let dependency = vk::SubpassDependency { let dependency = vk::SubpassDependency {
dependency_flags: Default::default(), dependency_flags: Default::default(),
src_subpass: vk::VK_SUBPASS_EXTERNAL, src_subpass: vk::VK_SUBPASS_EXTERNAL,
dst_subpass: Default::default(), dst_subpass: Default::default(),
src_stage_mask: vk::PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, src_stage_mask: vk::PipelineStageFlags::COLOR_ATTACHMENT_OUTPUT,
src_access_mask: Default::default(), src_access_mask: Default::default(),
dst_access_mask: vk::ACCESS_COLOR_ATTACHMENT_READ_BIT dst_access_mask: vk::AccessFlags::COLOR_ATTACHMENT_READ
| vk::ACCESS_COLOR_ATTACHMENT_WRITE_BIT, | vk::AccessFlags::COLOR_ATTACHMENT_WRITE,
dst_stage_mask: vk::PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, dst_stage_mask: vk::PipelineStageFlags::COLOR_ATTACHMENT_OUTPUT,
}; };
let subpass = vk::SubpassDescription { let subpass = vk::SubpassDescription {
color_attachment_count: 1, color_attachment_count: 1,
p_color_attachments: &color_attachment_ref, p_color_attachments: &color_attachment_ref,
p_depth_stencil_attachment: &depth_attachment_ref, p_depth_stencil_attachment: &depth_attachment_ref,
flags: Default::default(), flags: Default::default(),
pipeline_bind_point: vk::PipelineBindPoint::Graphics, pipeline_bind_point: vk::PipelineBindPoint::GRAPHICS,
input_attachment_count: 0, input_attachment_count: 0,
p_input_attachments: ptr::null(), p_input_attachments: ptr::null(),
p_resolve_attachments: ptr::null(), p_resolve_attachments: ptr::null(),
@ -78,7 +78,7 @@ fn main() {
p_preserve_attachments: ptr::null(), p_preserve_attachments: ptr::null(),
}; };
let renderpass_create_info = vk::RenderPassCreateInfo { let renderpass_create_info = vk::RenderPassCreateInfo {
s_type: vk::StructureType::RenderPassCreateInfo, s_type: vk::StructureType::RENDER_PASS_CREATE_INFO,
flags: Default::default(), flags: Default::default(),
p_next: ptr::null(), p_next: ptr::null(),
attachment_count: renderpass_attachments.len() as u32, attachment_count: renderpass_attachments.len() as u32,
@ -88,15 +88,17 @@ fn main() {
dependency_count: 1, dependency_count: 1,
p_dependencies: &dependency, p_dependencies: &dependency,
}; };
let renderpass = base.device let renderpass = base
.device
.create_render_pass(&renderpass_create_info, None) .create_render_pass(&renderpass_create_info, None)
.unwrap(); .unwrap();
let framebuffers: Vec<vk::Framebuffer> = base.present_image_views let framebuffers: Vec<vk::Framebuffer> = base
.present_image_views
.iter() .iter()
.map(|&present_image_view| { .map(|&present_image_view| {
let framebuffer_attachments = [present_image_view, base.depth_image_view]; let framebuffer_attachments = [present_image_view, base.depth_image_view];
let frame_buffer_create_info = vk::FramebufferCreateInfo { let frame_buffer_create_info = vk::FramebufferCreateInfo {
s_type: vk::StructureType::FramebufferCreateInfo, s_type: vk::StructureType::FRAMEBUFFER_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
render_pass: renderpass, render_pass: renderpass,
@ -113,12 +115,12 @@ fn main() {
.collect(); .collect();
let index_buffer_data = [0u32, 1, 2]; let index_buffer_data = [0u32, 1, 2];
let index_buffer_info = vk::BufferCreateInfo { let index_buffer_info = vk::BufferCreateInfo {
s_type: vk::StructureType::BufferCreateInfo, s_type: vk::StructureType::BUFFER_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: vk::BufferCreateFlags::empty(), flags: vk::BufferCreateFlags::empty(),
size: std::mem::size_of_val(&index_buffer_data) as u64, size: std::mem::size_of_val(&index_buffer_data) as u64,
usage: vk::BUFFER_USAGE_INDEX_BUFFER_BIT, usage: vk::BufferUsageFlags::INDEX_BUFFER,
sharing_mode: vk::SharingMode::Exclusive, sharing_mode: vk::SharingMode::EXCLUSIVE,
queue_family_index_count: 0, queue_family_index_count: 0,
p_queue_family_indices: ptr::null(), p_queue_family_indices: ptr::null(),
}; };
@ -128,18 +130,20 @@ fn main() {
find_memorytype_index( find_memorytype_index(
&index_buffer_memory_req, &index_buffer_memory_req,
&base.device_memory_properties, &base.device_memory_properties,
vk::MEMORY_PROPERTY_HOST_VISIBLE_BIT, vk::MemoryPropertyFlags::HOST_VISIBLE,
).expect("Unable to find suitable memorytype for the index buffer."); ).expect("Unable to find suitable memorytype for the index buffer.");
let index_allocate_info = vk::MemoryAllocateInfo { let index_allocate_info = vk::MemoryAllocateInfo {
s_type: vk::StructureType::MemoryAllocateInfo, s_type: vk::StructureType::MEMORY_ALLOCATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
allocation_size: index_buffer_memory_req.size, allocation_size: index_buffer_memory_req.size,
memory_type_index: index_buffer_memory_index, memory_type_index: index_buffer_memory_index,
}; };
let index_buffer_memory = base.device let index_buffer_memory = base
.device
.allocate_memory(&index_allocate_info, None) .allocate_memory(&index_allocate_info, None)
.unwrap(); .unwrap();
let index_ptr = base.device let index_ptr = base
.device
.map_memory( .map_memory(
index_buffer_memory, index_buffer_memory,
0, 0,
@ -159,34 +163,37 @@ fn main() {
.unwrap(); .unwrap();
let vertex_input_buffer_info = vk::BufferCreateInfo { let vertex_input_buffer_info = vk::BufferCreateInfo {
s_type: vk::StructureType::BufferCreateInfo, s_type: vk::StructureType::BUFFER_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: vk::BufferCreateFlags::empty(), flags: vk::BufferCreateFlags::empty(),
size: 3 * std::mem::size_of::<Vertex>() as u64, size: 3 * std::mem::size_of::<Vertex>() as u64,
usage: vk::BUFFER_USAGE_VERTEX_BUFFER_BIT, usage: vk::BufferUsageFlags::VERTEX_BUFFER,
sharing_mode: vk::SharingMode::Exclusive, sharing_mode: vk::SharingMode::EXCLUSIVE,
queue_family_index_count: 0, queue_family_index_count: 0,
p_queue_family_indices: ptr::null(), p_queue_family_indices: ptr::null(),
}; };
let vertex_input_buffer = base.device let vertex_input_buffer = base
.device
.create_buffer(&vertex_input_buffer_info, None) .create_buffer(&vertex_input_buffer_info, None)
.unwrap(); .unwrap();
let vertex_input_buffer_memory_req = base.device let vertex_input_buffer_memory_req = base
.device
.get_buffer_memory_requirements(vertex_input_buffer); .get_buffer_memory_requirements(vertex_input_buffer);
let vertex_input_buffer_memory_index = let vertex_input_buffer_memory_index =
find_memorytype_index( find_memorytype_index(
&vertex_input_buffer_memory_req, &vertex_input_buffer_memory_req,
&base.device_memory_properties, &base.device_memory_properties,
vk::MEMORY_PROPERTY_HOST_VISIBLE_BIT, vk::MemoryPropertyFlags::HOST_VISIBLE,
).expect("Unable to find suitable memorytype for the vertex buffer."); ).expect("Unable to find suitable memorytype for the vertex buffer.");
let vertex_buffer_allocate_info = vk::MemoryAllocateInfo { let vertex_buffer_allocate_info = vk::MemoryAllocateInfo {
s_type: vk::StructureType::MemoryAllocateInfo, s_type: vk::StructureType::MEMORY_ALLOCATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
allocation_size: vertex_input_buffer_memory_req.size, allocation_size: vertex_input_buffer_memory_req.size,
memory_type_index: vertex_input_buffer_memory_index, memory_type_index: vertex_input_buffer_memory_index,
}; };
let vertex_input_buffer_memory = base.device let vertex_input_buffer_memory = base
.device
.allocate_memory(&vertex_buffer_allocate_info, None) .allocate_memory(&vertex_buffer_allocate_info, None)
.unwrap(); .unwrap();
let vertices = [ let vertices = [
@ -203,7 +210,8 @@ fn main() {
color: [1.0, 0.0, 0.0, 1.0], color: [1.0, 0.0, 0.0, 1.0],
}, },
]; ];
let vert_ptr = base.device let vert_ptr = base
.device
.map_memory( .map_memory(
vertex_input_buffer_memory, vertex_input_buffer_memory,
0, 0,
@ -231,7 +239,7 @@ fn main() {
.filter_map(|byte| byte.ok()) .filter_map(|byte| byte.ok())
.collect(); .collect();
let vertex_shader_info = vk::ShaderModuleCreateInfo { let vertex_shader_info = vk::ShaderModuleCreateInfo {
s_type: vk::StructureType::ShaderModuleCreateInfo, s_type: vk::StructureType::SHADER_MODULE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
code_size: vertex_bytes.len(), code_size: vertex_bytes.len(),
@ -239,22 +247,24 @@ fn main() {
}; };
let frag_bytes: Vec<u8> = frag_spv_file.bytes().filter_map(|byte| byte.ok()).collect(); let frag_bytes: Vec<u8> = frag_spv_file.bytes().filter_map(|byte| byte.ok()).collect();
let frag_shader_info = vk::ShaderModuleCreateInfo { let frag_shader_info = vk::ShaderModuleCreateInfo {
s_type: vk::StructureType::ShaderModuleCreateInfo, s_type: vk::StructureType::SHADER_MODULE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
code_size: frag_bytes.len(), code_size: frag_bytes.len(),
p_code: frag_bytes.as_ptr() as *const u32, p_code: frag_bytes.as_ptr() as *const u32,
}; };
let vertex_shader_module = base.device let vertex_shader_module = base
.device
.create_shader_module(&vertex_shader_info, None) .create_shader_module(&vertex_shader_info, None)
.expect("Vertex shader module error"); .expect("Vertex shader module error");
let fragment_shader_module = base.device let fragment_shader_module = base
.device
.create_shader_module(&frag_shader_info, None) .create_shader_module(&frag_shader_info, None)
.expect("Fragment shader module error"); .expect("Fragment shader module error");
let layout_create_info = vk::PipelineLayoutCreateInfo { let layout_create_info = vk::PipelineLayoutCreateInfo {
s_type: vk::StructureType::PipelineLayoutCreateInfo, s_type: vk::StructureType::PIPELINE_LAYOUT_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
set_layout_count: 0, set_layout_count: 0,
@ -263,54 +273,53 @@ fn main() {
p_push_constant_ranges: ptr::null(), p_push_constant_ranges: ptr::null(),
}; };
let pipeline_layout = base.device let pipeline_layout = base
.device
.create_pipeline_layout(&layout_create_info, None) .create_pipeline_layout(&layout_create_info, None)
.unwrap(); .unwrap();
let shader_entry_name = CString::new("main").unwrap(); let shader_entry_name = CString::new("main").unwrap();
let shader_stage_create_infos = [ let shader_stage_create_infos = [
vk::PipelineShaderStageCreateInfo { vk::PipelineShaderStageCreateInfo {
s_type: vk::StructureType::PipelineShaderStageCreateInfo, s_type: vk::StructureType::PIPELINE_SHADER_STAGE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
module: vertex_shader_module, module: vertex_shader_module,
p_name: shader_entry_name.as_ptr(), p_name: shader_entry_name.as_ptr(),
p_specialization_info: ptr::null(), p_specialization_info: ptr::null(),
stage: vk::SHADER_STAGE_VERTEX_BIT, stage: vk::ShaderStageFlags::VERTEX,
}, },
vk::PipelineShaderStageCreateInfo { vk::PipelineShaderStageCreateInfo {
s_type: vk::StructureType::PipelineShaderStageCreateInfo, s_type: vk::StructureType::PIPELINE_SHADER_STAGE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
module: fragment_shader_module, module: fragment_shader_module,
p_name: shader_entry_name.as_ptr(), p_name: shader_entry_name.as_ptr(),
p_specialization_info: ptr::null(), p_specialization_info: ptr::null(),
stage: vk::SHADER_STAGE_FRAGMENT_BIT, stage: vk::ShaderStageFlags::FRAGMENT,
},
];
let vertex_input_binding_descriptions = [
vk::VertexInputBindingDescription {
binding: 0,
stride: mem::size_of::<Vertex>() as u32,
input_rate: vk::VertexInputRate::Vertex,
}, },
]; ];
let vertex_input_binding_descriptions = [vk::VertexInputBindingDescription {
binding: 0,
stride: mem::size_of::<Vertex>() as u32,
input_rate: vk::VertexInputRate::VERTEX,
}];
let vertex_input_attribute_descriptions = [ let vertex_input_attribute_descriptions = [
vk::VertexInputAttributeDescription { vk::VertexInputAttributeDescription {
location: 0, location: 0,
binding: 0, binding: 0,
format: vk::Format::R32g32b32a32Sfloat, format: vk::Format::R32G32B32A32_SFLOAT,
offset: offset_of!(Vertex, pos) as u32, offset: offset_of!(Vertex, pos) as u32,
}, },
vk::VertexInputAttributeDescription { vk::VertexInputAttributeDescription {
location: 1, location: 1,
binding: 0, binding: 0,
format: vk::Format::R32g32b32a32Sfloat, format: vk::Format::R32G32B32A32_SFLOAT,
offset: offset_of!(Vertex, color) as u32, offset: offset_of!(Vertex, color) as u32,
}, },
]; ];
let vertex_input_state_info = vk::PipelineVertexInputStateCreateInfo { let vertex_input_state_info = vk::PipelineVertexInputStateCreateInfo {
s_type: vk::StructureType::PipelineVertexInputStateCreateInfo, s_type: vk::StructureType::PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
vertex_attribute_description_count: vertex_input_attribute_descriptions.len() as u32, vertex_attribute_description_count: vertex_input_attribute_descriptions.len() as u32,
@ -319,30 +328,26 @@ fn main() {
p_vertex_binding_descriptions: vertex_input_binding_descriptions.as_ptr(), p_vertex_binding_descriptions: vertex_input_binding_descriptions.as_ptr(),
}; };
let vertex_input_assembly_state_info = vk::PipelineInputAssemblyStateCreateInfo { let vertex_input_assembly_state_info = vk::PipelineInputAssemblyStateCreateInfo {
s_type: vk::StructureType::PipelineInputAssemblyStateCreateInfo, s_type: vk::StructureType::PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,
flags: Default::default(), flags: Default::default(),
p_next: ptr::null(), p_next: ptr::null(),
primitive_restart_enable: 0, primitive_restart_enable: 0,
topology: vk::PrimitiveTopology::TriangleList, topology: vk::PrimitiveTopology::TRIANGLE_LIST,
}; };
let viewports = [ let viewports = [vk::Viewport {
vk::Viewport { x: 0.0,
x: 0.0, y: 0.0,
y: 0.0, width: base.surface_resolution.width as f32,
width: base.surface_resolution.width as f32, height: base.surface_resolution.height as f32,
height: base.surface_resolution.height as f32, min_depth: 0.0,
min_depth: 0.0, max_depth: 1.0,
max_depth: 1.0, }];
}, let scissors = [vk::Rect2D {
]; offset: vk::Offset2D { x: 0, y: 0 },
let scissors = [ extent: base.surface_resolution.clone(),
vk::Rect2D { }];
offset: vk::Offset2D { x: 0, y: 0 },
extent: base.surface_resolution.clone(),
},
];
let viewport_state_info = vk::PipelineViewportStateCreateInfo { let viewport_state_info = vk::PipelineViewportStateCreateInfo {
s_type: vk::StructureType::PipelineViewportStateCreateInfo, s_type: vk::StructureType::PIPELINE_VIEWPORT_STATE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
scissor_count: scissors.len() as u32, scissor_count: scissors.len() as u32,
@ -351,25 +356,25 @@ fn main() {
p_viewports: viewports.as_ptr(), p_viewports: viewports.as_ptr(),
}; };
let rasterization_info = vk::PipelineRasterizationStateCreateInfo { let rasterization_info = vk::PipelineRasterizationStateCreateInfo {
s_type: vk::StructureType::PipelineRasterizationStateCreateInfo, s_type: vk::StructureType::PIPELINE_RASTERIZATION_STATE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
cull_mode: vk::CULL_MODE_NONE, cull_mode: vk::CullModeFlags::NONE,
depth_bias_clamp: 0.0, depth_bias_clamp: 0.0,
depth_bias_constant_factor: 0.0, depth_bias_constant_factor: 0.0,
depth_bias_enable: 0, depth_bias_enable: 0,
depth_bias_slope_factor: 0.0, depth_bias_slope_factor: 0.0,
depth_clamp_enable: 0, depth_clamp_enable: 0,
front_face: vk::FrontFace::CounterClockwise, front_face: vk::FrontFace::COUNTER_CLOCKWISE,
line_width: 1.0, line_width: 1.0,
polygon_mode: vk::PolygonMode::Fill, polygon_mode: vk::PolygonMode::FILL,
rasterizer_discard_enable: 0, rasterizer_discard_enable: 0,
}; };
let multisample_state_info = vk::PipelineMultisampleStateCreateInfo { let multisample_state_info = vk::PipelineMultisampleStateCreateInfo {
s_type: vk::StructureType::PipelineMultisampleStateCreateInfo, s_type: vk::StructureType::PIPELINE_MULTISAMPLE_STATE_CREATE_INFO,
flags: Default::default(), flags: Default::default(),
p_next: ptr::null(), p_next: ptr::null(),
rasterization_samples: vk::SAMPLE_COUNT_1_BIT, rasterization_samples: vk::SampleCountFlags::TYPE_1,
sample_shading_enable: 0, sample_shading_enable: 0,
min_sample_shading: 0.0, min_sample_shading: 0.0,
p_sample_mask: ptr::null(), p_sample_mask: ptr::null(),
@ -377,21 +382,21 @@ fn main() {
alpha_to_coverage_enable: 0, alpha_to_coverage_enable: 0,
}; };
let noop_stencil_state = vk::StencilOpState { let noop_stencil_state = vk::StencilOpState {
fail_op: vk::StencilOp::Keep, fail_op: vk::StencilOp::KEEP,
pass_op: vk::StencilOp::Keep, pass_op: vk::StencilOp::KEEP,
depth_fail_op: vk::StencilOp::Keep, depth_fail_op: vk::StencilOp::KEEP,
compare_op: vk::CompareOp::Always, compare_op: vk::CompareOp::ALWAYS,
compare_mask: 0, compare_mask: 0,
write_mask: 0, write_mask: 0,
reference: 0, reference: 0,
}; };
let depth_state_info = vk::PipelineDepthStencilStateCreateInfo { let depth_state_info = vk::PipelineDepthStencilStateCreateInfo {
s_type: vk::StructureType::PipelineDepthStencilStateCreateInfo, s_type: vk::StructureType::PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
depth_test_enable: 1, depth_test_enable: 1,
depth_write_enable: 1, depth_write_enable: 1,
depth_compare_op: vk::CompareOp::LessOrEqual, depth_compare_op: vk::CompareOp::LESS_OR_EQUAL,
depth_bounds_test_enable: 0, depth_bounds_test_enable: 0,
stencil_test_enable: 0, stencil_test_enable: 0,
front: noop_stencil_state.clone(), front: noop_stencil_state.clone(),
@ -399,38 +404,36 @@ fn main() {
max_depth_bounds: 1.0, max_depth_bounds: 1.0,
min_depth_bounds: 0.0, min_depth_bounds: 0.0,
}; };
let color_blend_attachment_states = [ let color_blend_attachment_states = [vk::PipelineColorBlendAttachmentState {
vk::PipelineColorBlendAttachmentState { blend_enable: 0,
blend_enable: 0, src_color_blend_factor: vk::BlendFactor::SRC_COLOR,
src_color_blend_factor: vk::BlendFactor::SrcColor, dst_color_blend_factor: vk::BlendFactor::ONE_MINUS_DST_COLOR,
dst_color_blend_factor: vk::BlendFactor::OneMinusDstColor, color_blend_op: vk::BlendOp::ADD,
color_blend_op: vk::BlendOp::Add, src_alpha_blend_factor: vk::BlendFactor::ZERO,
src_alpha_blend_factor: vk::BlendFactor::Zero, dst_alpha_blend_factor: vk::BlendFactor::ZERO,
dst_alpha_blend_factor: vk::BlendFactor::Zero, alpha_blend_op: vk::BlendOp::ADD,
alpha_blend_op: vk::BlendOp::Add, color_write_mask: vk::ColorComponentFlags::all(),
color_write_mask: vk::ColorComponentFlags::all(), }];
},
];
let color_blend_state = vk::PipelineColorBlendStateCreateInfo { let color_blend_state = vk::PipelineColorBlendStateCreateInfo {
s_type: vk::StructureType::PipelineColorBlendStateCreateInfo, s_type: vk::StructureType::PIPELINE_COLOR_BLEND_STATE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
logic_op_enable: 0, logic_op_enable: 0,
logic_op: vk::LogicOp::Clear, logic_op: vk::LogicOp::CLEAR,
attachment_count: color_blend_attachment_states.len() as u32, attachment_count: color_blend_attachment_states.len() as u32,
p_attachments: color_blend_attachment_states.as_ptr(), p_attachments: color_blend_attachment_states.as_ptr(),
blend_constants: [0.0, 0.0, 0.0, 0.0], blend_constants: [0.0, 0.0, 0.0, 0.0],
}; };
let dynamic_state = [vk::DynamicState::Viewport, vk::DynamicState::Scissor]; let dynamic_state = [vk::DynamicState::VIEWPORT, vk::DynamicState::SCISSOR];
let dynamic_state_info = vk::PipelineDynamicStateCreateInfo { let dynamic_state_info = vk::PipelineDynamicStateCreateInfo {
s_type: vk::StructureType::PipelineDynamicStateCreateInfo, s_type: vk::StructureType::PIPELINE_DYNAMIC_STATE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
dynamic_state_count: dynamic_state.len() as u32, dynamic_state_count: dynamic_state.len() as u32,
p_dynamic_states: dynamic_state.as_ptr(), p_dynamic_states: dynamic_state.as_ptr(),
}; };
let graphic_pipeline_info = vk::GraphicsPipelineCreateInfo { let graphic_pipeline_info = vk::GraphicsPipelineCreateInfo {
s_type: vk::StructureType::GraphicsPipelineCreateInfo, s_type: vk::StructureType::GRAPHICS_PIPELINE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: vk::PipelineCreateFlags::empty(), flags: vk::PipelineCreateFlags::empty(),
stage_count: shader_stage_create_infos.len() as u32, stage_count: shader_stage_create_infos.len() as u32,
@ -450,14 +453,16 @@ fn main() {
base_pipeline_handle: vk::Pipeline::null(), base_pipeline_handle: vk::Pipeline::null(),
base_pipeline_index: 0, base_pipeline_index: 0,
}; };
let graphics_pipelines = base.device let graphics_pipelines = base
.device
.create_graphics_pipelines(vk::PipelineCache::null(), &[graphic_pipeline_info], None) .create_graphics_pipelines(vk::PipelineCache::null(), &[graphic_pipeline_info], None)
.expect("Unable to create graphics pipeline"); .expect("Unable to create graphics pipeline");
let graphic_pipeline = graphics_pipelines[0]; let graphic_pipeline = graphics_pipelines[0];
base.render_loop(|| { base.render_loop(|| {
let present_index = base.swapchain_loader let present_index = base
.swapchain_loader
.acquire_next_image_khr( .acquire_next_image_khr(
base.swapchain, base.swapchain,
std::u64::MAX, std::u64::MAX,
@ -472,7 +477,7 @@ fn main() {
}, },
}, },
vk::ClearValue { vk::ClearValue {
depth: vk::ClearDepthStencilValue { depth_stencil: vk::ClearDepthStencilValue {
depth: 1.0, depth: 1.0,
stencil: 0, stencil: 0,
}, },
@ -480,7 +485,7 @@ fn main() {
]; ];
let render_pass_begin_info = vk::RenderPassBeginInfo { let render_pass_begin_info = vk::RenderPassBeginInfo {
s_type: vk::StructureType::RenderPassBeginInfo, s_type: vk::StructureType::RENDER_PASS_BEGIN_INFO,
p_next: ptr::null(), p_next: ptr::null(),
render_pass: renderpass, render_pass: renderpass,
framebuffer: framebuffers[present_index as usize], framebuffer: framebuffers[present_index as usize],
@ -495,18 +500,18 @@ fn main() {
&base.device, &base.device,
base.draw_command_buffer, base.draw_command_buffer,
base.present_queue, base.present_queue,
&[vk::PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT], &[vk::PipelineStageFlags::COLOR_ATTACHMENT_OUTPUT],
&[base.present_complete_semaphore], &[base.present_complete_semaphore],
&[base.rendering_complete_semaphore], &[base.rendering_complete_semaphore],
|device, draw_command_buffer| { |device, draw_command_buffer| {
device.cmd_begin_render_pass( device.cmd_begin_render_pass(
draw_command_buffer, draw_command_buffer,
&render_pass_begin_info, &render_pass_begin_info,
vk::SubpassContents::Inline, vk::SubpassContents::INLINE,
); );
device.cmd_bind_pipeline( device.cmd_bind_pipeline(
draw_command_buffer, draw_command_buffer,
vk::PipelineBindPoint::Graphics, vk::PipelineBindPoint::GRAPHICS,
graphic_pipeline, graphic_pipeline,
); );
device.cmd_set_viewport(draw_command_buffer, 0, &viewports); device.cmd_set_viewport(draw_command_buffer, 0, &viewports);
@ -521,7 +526,7 @@ fn main() {
draw_command_buffer, draw_command_buffer,
index_buffer, index_buffer,
0, 0,
vk::IndexType::Uint32, vk::IndexType::UINT32,
); );
device.cmd_draw_indexed( device.cmd_draw_indexed(
draw_command_buffer, draw_command_buffer,
@ -538,7 +543,7 @@ fn main() {
); );
//let mut present_info_err = mem::uninitialized(); //let mut present_info_err = mem::uninitialized();
let present_info = vk::PresentInfoKHR { let present_info = vk::PresentInfoKHR {
s_type: vk::StructureType::PresentInfoKhr, s_type: vk::StructureType::PRESENT_INFO_KHR,
p_next: ptr::null(), p_next: ptr::null(),
wait_semaphore_count: 1, wait_semaphore_count: 1,
p_wait_semaphores: &base.rendering_complete_semaphore, p_wait_semaphores: &base.rendering_complete_semaphore,

161
examples/src/lib.rs
View file

@ -4,30 +4,32 @@ extern crate ash;
extern crate winapi; extern crate winapi;
extern crate winit; extern crate winit;
#[cfg(windows)]
use ash::extensions::Win32Surface;
#[cfg(not(windows))]
use ash::extensions::XlibSurface;
use ash::extensions::{DebugReport, Surface, Swapchain};
pub use ash::version::{DeviceV1_0, EntryV1_0, InstanceV1_0, V1_0};
use ash::vk; use ash::vk;
use std::default::Default; use ash::Device;
use ash::Entry; use ash::Entry;
use ash::Instance; use ash::Instance;
use ash::Device;
pub use ash::version::{DeviceV1_0, EntryV1_0, InstanceV1_0, V1_0};
use ash::extensions::{DebugReport, Surface, Swapchain, Win32Surface, XlibSurface};
use std::cell::RefCell; use std::cell::RefCell;
use std::ptr; use std::default::Default;
use std::ffi::{CStr, CString}; use std::ffi::{CStr, CString};
use std::ops::Drop; use std::ops::Drop;
use std::ptr;
// Simple offset_of macro akin to C++ offsetof // Simple offset_of macro akin to C++ offsetof
#[macro_export] #[macro_export]
macro_rules! offset_of{ macro_rules! offset_of {
($base: path, $field: ident) => { ($base:path, $field:ident) => {{
{ #[allow(unused_unsafe)]
#[allow(unused_unsafe)] unsafe {
unsafe{ let b: $base = mem::uninitialized();
let b: $base = mem::uninitialized(); (&b.$field as *const _ as isize) - (&b as *const _ as isize)
(&b.$field as *const _ as isize) - (&b as *const _ as isize)
}
} }
} }};
} }
pub fn record_submit_commandbuffer<D: DeviceV1_0, F: FnOnce(&D, vk::CommandBuffer)>( pub fn record_submit_commandbuffer<D: DeviceV1_0, F: FnOnce(&D, vk::CommandBuffer)>(
@ -43,14 +45,14 @@ pub fn record_submit_commandbuffer<D: DeviceV1_0, F: FnOnce(&D, vk::CommandBuffe
device device
.reset_command_buffer( .reset_command_buffer(
command_buffer, command_buffer,
vk::COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT, vk::CommandBufferResetFlags::RELEASE_RESOURCES,
) )
.expect("Reset command buffer failed."); .expect("Reset command buffer failed.");
let command_buffer_begin_info = vk::CommandBufferBeginInfo { let command_buffer_begin_info = vk::CommandBufferBeginInfo {
s_type: vk::StructureType::CommandBufferBeginInfo, s_type: vk::StructureType::COMMAND_BUFFER_BEGIN_INFO,
p_next: ptr::null(), p_next: ptr::null(),
p_inheritance_info: ptr::null(), p_inheritance_info: ptr::null(),
flags: vk::COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, 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)
@ -60,7 +62,7 @@ pub fn record_submit_commandbuffer<D: DeviceV1_0, F: FnOnce(&D, vk::CommandBuffe
.end_command_buffer(command_buffer) .end_command_buffer(command_buffer)
.expect("End commandbuffer"); .expect("End commandbuffer");
let fence_create_info = vk::FenceCreateInfo { let fence_create_info = vk::FenceCreateInfo {
s_type: vk::StructureType::FenceCreateInfo, s_type: vk::StructureType::FENCE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: vk::FenceCreateFlags::empty(), flags: vk::FenceCreateFlags::empty(),
}; };
@ -68,7 +70,7 @@ 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 submit_info = vk::SubmitInfo { let submit_info = vk::SubmitInfo {
s_type: vk::StructureType::SubmitInfo, s_type: vk::StructureType::SUBMIT_INFO,
p_next: ptr::null(), p_next: ptr::null(),
wait_semaphore_count: wait_semaphores.len() as u32, wait_semaphore_count: wait_semaphores.len() as u32,
p_wait_semaphores: wait_semaphores.as_ptr(), p_wait_semaphores: wait_semaphores.as_ptr(),
@ -98,7 +100,7 @@ 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 { let x11_create_info = vk::XlibSurfaceCreateInfoKHR {
s_type: vk::StructureType::XlibSurfaceCreateInfoKhr, s_type: vk::StructureType::XLIB_SURFACE_CREATE_INFO_KHR,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
window: x11_window as vk::Window, window: x11_window as vk::Window,
@ -122,7 +124,7 @@ unsafe fn create_surface<E: EntryV1_0, I: InstanceV1_0>(
let hwnd = window.get_hwnd() as HWND; let hwnd = window.get_hwnd() as HWND;
let hinstance = GetWindow(hwnd, 0) as *const vk::c_void; let hinstance = GetWindow(hwnd, 0) as *const vk::c_void;
let win32_create_info = vk::Win32SurfaceCreateInfoKHR { let win32_create_info = vk::Win32SurfaceCreateInfoKHR {
s_type: vk::StructureType::Win32SurfaceCreateInfoKhr, s_type: vk::StructureType::WIN32_SURFACE_CREATE_INFO_KHR,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
hinstance: hinstance, hinstance: hinstance,
@ -280,7 +282,7 @@ impl ExampleBase {
let extension_names_raw = extension_names(); let extension_names_raw = extension_names();
let appinfo = vk::ApplicationInfo { let appinfo = vk::ApplicationInfo {
p_application_name: raw_name, p_application_name: raw_name,
s_type: vk::StructureType::ApplicationInfo, s_type: vk::StructureType::APPLICATION_INFO,
p_next: ptr::null(), p_next: ptr::null(),
application_version: 0, application_version: 0,
p_engine_name: raw_name, p_engine_name: raw_name,
@ -288,7 +290,7 @@ impl ExampleBase {
api_version: vk_make_version!(1, 0, 36), api_version: vk_make_version!(1, 0, 36),
}; };
let create_info = vk::InstanceCreateInfo { let create_info = vk::InstanceCreateInfo {
s_type: vk::StructureType::InstanceCreateInfo, s_type: vk::StructureType::INSTANCE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
p_application_info: &appinfo, p_application_info: &appinfo,
@ -301,10 +303,11 @@ impl ExampleBase {
.create_instance(&create_info, None) .create_instance(&create_info, None)
.expect("Instance creation error"); .expect("Instance creation error");
let debug_info = vk::DebugReportCallbackCreateInfoEXT { let debug_info = vk::DebugReportCallbackCreateInfoEXT {
s_type: vk::StructureType::DebugReportCallbackCreateInfoExt, s_type: vk::StructureType::DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT,
p_next: ptr::null(), p_next: ptr::null(),
flags: vk::DEBUG_REPORT_ERROR_BIT_EXT | vk::DEBUG_REPORT_WARNING_BIT_EXT flags: vk::DebugReportFlagsEXT::ERROR_EXT
| vk::DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT, | vk::DebugReportFlagsEXT::WARNING_EXT
| 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(),
}; };
@ -327,13 +330,13 @@ impl ExampleBase {
.iter() .iter()
.enumerate() .enumerate()
.filter_map(|(index, ref info)| { .filter_map(|(index, ref info)| {
let supports_graphic_and_surface = info.queue_flags let supports_graphic_and_surface =
.subset(vk::QUEUE_GRAPHICS_BIT) info.queue_flags.subset(vk::QueueFlags::GRAPHICS)
&& surface_loader.get_physical_device_surface_support_khr( && surface_loader.get_physical_device_surface_support_khr(
*pdevice, *pdevice,
index as u32, index as u32,
surface, surface,
); );
match supports_graphic_and_surface { match supports_graphic_and_surface {
true => Some((*pdevice, index)), true => Some((*pdevice, index)),
_ => None, _ => None,
@ -352,7 +355,7 @@ impl ExampleBase {
}; };
let priorities = [1.0]; let priorities = [1.0];
let queue_info = vk::DeviceQueueCreateInfo { let queue_info = vk::DeviceQueueCreateInfo {
s_type: vk::StructureType::DeviceQueueCreateInfo, s_type: vk::StructureType::DEVICE_QUEUE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
queue_family_index: queue_family_index as u32, queue_family_index: queue_family_index as u32,
@ -360,7 +363,7 @@ impl ExampleBase {
queue_count: priorities.len() as u32, queue_count: priorities.len() as u32,
}; };
let device_create_info = vk::DeviceCreateInfo { let device_create_info = vk::DeviceCreateInfo {
s_type: vk::StructureType::DeviceCreateInfo, s_type: vk::StructureType::DEVICE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
queue_create_info_count: 1, queue_create_info_count: 1,
@ -382,8 +385,8 @@ impl ExampleBase {
let surface_format = surface_formats let surface_format = surface_formats
.iter() .iter()
.map(|sfmt| match sfmt.format { .map(|sfmt| match sfmt.format {
vk::Format:: => vk::SurfaceFormatKHR { vk::Format::UNDEFINED => vk::SurfaceFormatKHR {
format: vk::Format::B8g8r8Unorm, format: vk::Format::B8G8R8_UNORM,
color_space: sfmt.color_space, color_space: sfmt.color_space,
}, },
_ => sfmt.clone(), _ => sfmt.clone(),
@ -408,9 +411,9 @@ impl ExampleBase {
}; };
let pre_transform = if surface_capabilities let pre_transform = if surface_capabilities
.supported_transforms .supported_transforms
.subset(vk::SURFACE_TRANSFORM_IDENTITY_BIT_KHR) .subset(vk::SurfaceTransformFlagsKHR::IDENTITY_KHR)
{ {
vk::SURFACE_TRANSFORM_IDENTITY_BIT_KHR vk::SurfaceTransformFlagsKHR::IDENTITY_KHR
} else { } else {
surface_capabilities.current_transform surface_capabilities.current_transform
}; };
@ -420,12 +423,12 @@ 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 {
s_type: vk::StructureType::SwapchainCreateInfoKhr, s_type: vk::StructureType::SWAPCHAIN_CREATE_INFO_KHR,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
surface: surface, surface: surface,
@ -433,10 +436,10 @@ impl ExampleBase {
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::IMAGE_USAGE_COLOR_ATTACHMENT_BIT, 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::COMPOSITE_ALPHA_OPAQUE_BIT_KHR, 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(),
@ -448,18 +451,18 @@ impl ExampleBase {
.create_swapchain_khr(&swapchain_create_info, None) .create_swapchain_khr(&swapchain_create_info, None)
.unwrap(); .unwrap();
let pool_create_info = vk::CommandPoolCreateInfo { let pool_create_info = vk::CommandPoolCreateInfo {
s_type: vk::StructureType::CommandPoolCreateInfo, s_type: vk::StructureType::COMMAND_POOL_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: vk::CommandPoolCreateFlags::RESET_COMMAND_BUFFER_BIT, flags: vk::CommandPoolCreateFlags::RESET_COMMAND_BUFFER,
queue_family_index: queue_family_index, 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 { let command_buffer_allocate_info = vk::CommandBufferAllocateInfo {
s_type: vk::StructureType::CommandBufferAllocateInfo, s_type: vk::StructureType::COMMAND_BUFFER_ALLOCATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
command_buffer_count: 2, command_buffer_count: 2,
command_pool: pool, command_pool: pool,
level: vk::CommandBufferLevel::Primary, level: vk::CommandBufferLevel::PRIMARY,
}; };
let command_buffers = device let command_buffers = device
.allocate_command_buffers(&command_buffer_allocate_info) .allocate_command_buffers(&command_buffer_allocate_info)
@ -474,10 +477,10 @@ impl ExampleBase {
.iter() .iter()
.map(|&image| { .map(|&image| {
let create_view_info = vk::ImageViewCreateInfo { let create_view_info = vk::ImageViewCreateInfo {
s_type: vk::StructureType::ImageViewCreateInfo, s_type: vk::StructureType::IMAGE_VIEW_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
view_type: vk::ImageViewType::Type2d, view_type: vk::ImageViewType::TYPE_2D,
format: surface_format.format, format: surface_format.format,
components: vk::ComponentMapping { components: vk::ComponentMapping {
r: vk::ComponentSwizzle::R, r: vk::ComponentSwizzle::R,
@ -486,7 +489,7 @@ impl ExampleBase {
a: vk::ComponentSwizzle::A, a: vk::ComponentSwizzle::A,
}, },
subresource_range: vk::ImageSubresourceRange { subresource_range: vk::ImageSubresourceRange {
aspect_mask: vk::IMAGE_ASPECT_COLOR_BIT, aspect_mask: vk::ImageAspectFlags::COLOR,
base_mip_level: 0, base_mip_level: 0,
level_count: 1, level_count: 1,
base_array_layer: 0, base_array_layer: 0,
@ -499,11 +502,11 @@ impl ExampleBase {
.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 { let depth_image_create_info = vk::ImageCreateInfo {
s_type: vk::StructureType::ImageCreateInfo, s_type: vk::StructureType::IMAGE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
image_type: vk::ImageType::Type2d, image_type: vk::ImageType::TYPE_2D,
format: vk::Format::D16Unorm, 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,
@ -511,13 +514,13 @@ impl ExampleBase {
}, },
mip_levels: 1, mip_levels: 1,
array_layers: 1, array_layers: 1,
samples: vk::SAMPLE_COUNT_1_BIT, samples: vk::SampleCountFlags::TYPE_1,
tiling: vk::ImageTiling::Optimal, tiling: vk::ImageTiling::OPTIMAL,
usage: vk::IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, usage: vk::ImageUsageFlags::DEPTH_STENCIL_ATTACHMENT,
sharing_mode: vk::SharingMode::Exclusive, sharing_mode: vk::SharingMode::EXCLUSIVE,
queue_family_index_count: 0, queue_family_index_count: 0,
p_queue_family_indices: ptr::null(), p_queue_family_indices: ptr::null(),
initial_layout: vk::ImageLayout::Undefined, initial_layout: vk::ImageLayout::UNDEFINED,
}; };
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);
@ -525,11 +528,11 @@ impl ExampleBase {
find_memorytype_index( find_memorytype_index(
&depth_image_memory_req, &depth_image_memory_req,
&device_memory_properties, &device_memory_properties,
vk::MEMORY_PROPERTY_DEVICE_LOCAL_BIT, vk::MemoryPropertyFlags::DEVICE_LOCAL,
).expect("Unable to find suitable memory index for depth image."); ).expect("Unable to find suitable memory index for depth image.");
let depth_image_allocate_info = vk::MemoryAllocateInfo { let depth_image_allocate_info = vk::MemoryAllocateInfo {
s_type: vk::StructureType::MemoryAllocateInfo, s_type: vk::StructureType::MEMORY_ALLOCATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
allocation_size: depth_image_memory_req.size, allocation_size: depth_image_memory_req.size,
memory_type_index: depth_image_memory_index, memory_type_index: depth_image_memory_index,
@ -544,23 +547,23 @@ impl ExampleBase {
&device, &device,
setup_command_buffer, setup_command_buffer,
present_queue, present_queue,
&[vk::PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT], &[vk::PipelineStageFlags::BOTTOM_OF_PIPE],
&[], &[],
&[], &[],
|device, setup_command_buffer| { |device, setup_command_buffer| {
let layout_transition_barrier = vk::ImageMemoryBarrier { let layout_transition_barrier = vk::ImageMemoryBarrier {
s_type: vk::StructureType::ImageMemoryBarrier, s_type: vk::StructureType::IMAGE_MEMORY_BARRIER,
p_next: ptr::null(), p_next: ptr::null(),
src_access_mask: Default::default(), src_access_mask: Default::default(),
dst_access_mask: vk::ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT dst_access_mask: vk::AccessFlags::DEPTH_STENCIL_ATTACHMENT_READ
| vk::ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, | vk::AccessFlags::DEPTH_STENCIL_ATTACHMENT_WRITE,
old_layout: vk::ImageLayout::Undefined, old_layout: vk::ImageLayout::UNDEFINED,
new_layout: vk::ImageLayout::DepthStencilAttachmentOptimal, new_layout: vk::ImageLayout::DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
src_queue_family_index: vk::VK_QUEUE_FAMILY_IGNORED, src_queue_family_index: vk::VK_QUEUE_FAMILY_IGNORED,
dst_queue_family_index: vk::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::IMAGE_ASPECT_DEPTH_BIT, aspect_mask: vk::ImageAspectFlags::DEPTH,
base_mip_level: 0, base_mip_level: 0,
level_count: 1, level_count: 1,
base_array_layer: 0, base_array_layer: 0,
@ -569,8 +572,8 @@ impl ExampleBase {
}; };
device.cmd_pipeline_barrier( device.cmd_pipeline_barrier(
setup_command_buffer, setup_command_buffer,
vk::PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, vk::PipelineStageFlags::BOTTOM_OF_PIPE,
vk::PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT, vk::PipelineStageFlags::LATE_FRAGMENT_TESTS,
vk::DependencyFlags::empty(), vk::DependencyFlags::empty(),
&[], &[],
&[], &[],
@ -579,19 +582,19 @@ impl ExampleBase {
}, },
); );
let depth_image_view_info = vk::ImageViewCreateInfo { let depth_image_view_info = vk::ImageViewCreateInfo {
s_type: vk::StructureType::ImageViewCreateInfo, s_type: vk::StructureType::IMAGE_VIEW_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
view_type: vk::ImageViewType::Type2d, view_type: vk::ImageViewType::TYPE_2D,
format: depth_image_create_info.format, format: depth_image_create_info.format,
components: vk::ComponentMapping { components: vk::ComponentMapping {
r: vk::ComponentSwizzle::Identity, r: vk::ComponentSwizzle::IDENTITY,
g: vk::ComponentSwizzle::Identity, g: vk::ComponentSwizzle::IDENTITY,
b: vk::ComponentSwizzle::Identity, b: vk::ComponentSwizzle::IDENTITY,
a: vk::ComponentSwizzle::Identity, a: vk::ComponentSwizzle::IDENTITY,
}, },
subresource_range: vk::ImageSubresourceRange { subresource_range: vk::ImageSubresourceRange {
aspect_mask: vk::IMAGE_ASPECT_DEPTH_BIT, aspect_mask: vk::ImageAspectFlags::DEPTH,
base_mip_level: 0, base_mip_level: 0,
level_count: 1, level_count: 1,
base_array_layer: 0, base_array_layer: 0,
@ -603,7 +606,7 @@ impl ExampleBase {
.create_image_view(&depth_image_view_info, None) .create_image_view(&depth_image_view_info, None)
.unwrap(); .unwrap();
let semaphore_create_info = vk::SemaphoreCreateInfo { let semaphore_create_info = vk::SemaphoreCreateInfo {
s_type: vk::StructureType::SemaphoreCreateInfo, s_type: vk::StructureType::SEMAPHORE_CREATE_INFO,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
}; };