pre texture
This commit is contained in:
zomseffen
parent
ff4302837e
commit
0137d21406
5 changed files with 394 additions and 96 deletions
src
179
src/main.rs
179
src/main.rs
|
|
@ -29,14 +29,16 @@ use vulkanalia::vk::KhrSwapchainExtension;
|
|||
|
||||
use cgmath::{vec2, vec3};
|
||||
use std::mem::size_of;
|
||||
|
||||
use std::ptr::copy_nonoverlapping as memcpy;
|
||||
|
||||
use std::time::Instant;
|
||||
|
||||
pub mod app_data;
|
||||
pub mod errors;
|
||||
pub mod swapchain;
|
||||
pub mod queue_family_indices;
|
||||
pub mod vertex;
|
||||
pub mod buffer;
|
||||
|
||||
const PORTABILITY_MACOS_VERSION: Version = Version::new(1, 3, 216);
|
||||
const VALIDATION_ENABLED: bool =
|
||||
|
|
@ -48,12 +50,6 @@ const DEVICE_EXTENSIONS: &[vk::ExtensionName] = &[vk::KHR_SWAPCHAIN_EXTENSION.na
|
|||
|
||||
const MAX_FRAMES_IN_FLIGHT: usize = 2;
|
||||
|
||||
static VERTICES: [vertex::Vertex; 3] = [
|
||||
vertex::Vertex::new(vec2(0.0, -0.5), vec3(1.0, 0.0, 0.0)),
|
||||
vertex::Vertex::new(vec2(0.5, 0.5), vec3(0.0, 1.0, 0.0)),
|
||||
vertex::Vertex::new(vec2(-0.5, 0.5), vec3(0.0, 0.0, 1.0)),
|
||||
];
|
||||
|
||||
fn main() -> Result<()> {
|
||||
pretty_env_logger::init();
|
||||
|
||||
|
|
@ -108,6 +104,7 @@ struct App {
|
|||
frame: usize,
|
||||
resized: bool,
|
||||
minimized: bool,
|
||||
start: Instant,
|
||||
}
|
||||
|
||||
impl App {
|
||||
|
|
@ -124,19 +121,25 @@ impl App {
|
|||
swapchain::create_swapchain_image_views(&device, &mut data)?;
|
||||
create_render_pass(&instance, &device, &mut data)?;
|
||||
|
||||
buffer::create_descriptor_set_layout(&device, &mut data)?;
|
||||
create_pipeline(&device, &mut data)?;
|
||||
|
||||
create_framebuffers(&device, &mut data)?;
|
||||
|
||||
create_command_pool(&instance, &device, &mut data)?;
|
||||
|
||||
create_vertex_buffer(&instance, &device, &mut data)?;
|
||||
buffer::create_vertex_buffer(&instance, &device, &mut data)?;
|
||||
buffer::create_index_buffer(&instance, &device, &mut data)?;
|
||||
|
||||
buffer::create_uniform_buffers(&instance, &device, &mut data)?;
|
||||
buffer::create_descriptor_pool(&device, &mut data)?;
|
||||
buffer::create_descriptor_sets(&device, &mut data)?;
|
||||
|
||||
create_command_buffers(&device, &mut data)?;
|
||||
|
||||
create_sync_objects(&device, &mut data)?;
|
||||
|
||||
Ok(Self { entry, instance, data, device, frame: 0 , resized: false, minimized: false})
|
||||
Ok(Self { entry, instance, data, device, frame: 0 , resized: false, minimized: false, start: Instant::now()})
|
||||
}
|
||||
|
||||
/// Renders a frame for our Vulkan app.
|
||||
|
|
@ -165,6 +168,8 @@ impl App {
|
|||
|
||||
self.data.images_in_flight[image_index] = in_flight_fence;
|
||||
|
||||
self.update_uniform_buffer(image_index)?;
|
||||
|
||||
let wait_semaphores = &[self.data.image_available_semaphores[self.frame]];
|
||||
let wait_stages = &[vk::PipelineStageFlags::COLOR_ATTACHMENT_OUTPUT];
|
||||
let command_buffers = &[self.data.command_buffers[image_index]];
|
||||
|
|
@ -205,6 +210,11 @@ impl App {
|
|||
unsafe fn destroy(&mut self) {
|
||||
self.destroy_swapchain();
|
||||
|
||||
self.device.destroy_descriptor_set_layout(self.data.descriptor_set_layout, None);
|
||||
|
||||
self.device.destroy_buffer(self.data.index_buffer, None);
|
||||
self.device.free_memory(self.data.index_buffer_memory, None);
|
||||
|
||||
self.device.destroy_buffer(self.data.vertex_buffer, None);
|
||||
self.device.free_memory(self.data.vertex_buffer_memory, None);
|
||||
|
||||
|
|
@ -236,6 +246,9 @@ impl App {
|
|||
create_render_pass(&self.instance, &self.device, &mut self.data)?;
|
||||
create_pipeline(&self.device, &mut self.data)?;
|
||||
create_framebuffers(&self.device, &mut self.data)?;
|
||||
buffer::create_uniform_buffers(&self.instance, &self.device, &mut self.data)?;
|
||||
buffer::create_descriptor_pool(&self.device, &mut self.data)?;
|
||||
buffer::create_descriptor_sets(&self.device, &mut self.data)?;
|
||||
create_command_buffers(&self.device, &mut self.data)?;
|
||||
self.data
|
||||
.images_in_flight
|
||||
|
|
@ -244,6 +257,13 @@ impl App {
|
|||
}
|
||||
|
||||
unsafe fn destroy_swapchain(&mut self) {
|
||||
self.device.destroy_descriptor_pool(self.data.descriptor_pool, None);
|
||||
self.data.uniform_buffers
|
||||
.iter()
|
||||
.for_each(|b| self.device.destroy_buffer(*b, None));
|
||||
self.data.uniform_buffers_memory
|
||||
.iter()
|
||||
.for_each(|m| self.device.free_memory(*m, None));
|
||||
self.data.framebuffers
|
||||
.iter()
|
||||
.for_each(|f| self.device.destroy_framebuffer(*f, None));
|
||||
|
|
@ -257,6 +277,45 @@ impl App {
|
|||
self.device.destroy_swapchain_khr(self.data.swapchain, None);
|
||||
|
||||
}
|
||||
|
||||
unsafe fn update_uniform_buffer(&self, image_index: usize) -> Result<()> {
|
||||
let time = self.start.elapsed().as_secs_f32();
|
||||
|
||||
let model = buffer::Mat4::from_axis_angle(
|
||||
vec3(0.0, 0.0, 1.0),
|
||||
cgmath::Deg(90.0) * time
|
||||
);
|
||||
|
||||
let view = buffer::Mat4::look_at_rh(
|
||||
cgmath::point3(2.0, 2.0, 2.0),
|
||||
cgmath::point3(0.0, 0.0, 0.0),
|
||||
vec3(0.0, 0.0, 1.0),
|
||||
);
|
||||
|
||||
let mut proj = cgmath::perspective(
|
||||
cgmath::Deg(45.0),
|
||||
self.data.swapchain_extent.width as f32 / self.data.swapchain_extent.height as f32,
|
||||
0.1,
|
||||
10.0,
|
||||
);
|
||||
|
||||
proj[1][1] *= -1.0;
|
||||
|
||||
let ubo = buffer::UniformBufferObject { model, view, proj };
|
||||
|
||||
let memory = self.device.map_memory(
|
||||
self.data.uniform_buffers_memory[image_index],
|
||||
0,
|
||||
size_of::<buffer::UniformBufferObject>() as u64,
|
||||
vk::MemoryMapFlags::empty(),
|
||||
)?;
|
||||
|
||||
memcpy(&ubo, memory.cast(), 1);
|
||||
|
||||
self.device.unmap_memory(self.data.uniform_buffers_memory[image_index]);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
//================================================
|
||||
|
|
@ -528,7 +587,7 @@ unsafe fn create_pipeline(device: &Device, data: &mut app_data::AppData) -> Resu
|
|||
.polygon_mode(vk::PolygonMode::FILL)
|
||||
.line_width(1.0)
|
||||
.cull_mode(vk::CullModeFlags::BACK)
|
||||
.front_face(vk::FrontFace::CLOCKWISE)
|
||||
.front_face(vk::FrontFace::COUNTER_CLOCKWISE)
|
||||
.depth_bias_enable(false);
|
||||
|
||||
let multisample_state = vk::PipelineMultisampleStateCreateInfo::builder()
|
||||
|
|
@ -552,7 +611,9 @@ unsafe fn create_pipeline(device: &Device, data: &mut app_data::AppData) -> Resu
|
|||
.attachments(attachments)
|
||||
.blend_constants([0.0, 0.0, 0.0, 0.0]);
|
||||
|
||||
let layout_info = vk::PipelineLayoutCreateInfo::builder();
|
||||
let set_layouts = &[data.descriptor_set_layout];
|
||||
let layout_info = vk::PipelineLayoutCreateInfo::builder()
|
||||
.set_layouts(set_layouts);
|
||||
|
||||
data.pipeline_layout = device.create_pipeline_layout(&layout_info, None)?;
|
||||
|
||||
|
|
@ -712,7 +773,18 @@ unsafe fn create_command_buffers(device: &Device, data: &mut app_data::AppData)
|
|||
*command_buffer, vk::PipelineBindPoint::GRAPHICS, data.pipeline);
|
||||
|
||||
device.cmd_bind_vertex_buffers(*command_buffer, 0, &[data.vertex_buffer], &[0]);
|
||||
device.cmd_draw(*command_buffer, VERTICES.len() as u32, 1, 0, 0);
|
||||
device.cmd_bind_index_buffer(*command_buffer, data.index_buffer, 0, vk::IndexType::UINT16);
|
||||
|
||||
device.cmd_bind_descriptor_sets(
|
||||
*command_buffer,
|
||||
vk::PipelineBindPoint::GRAPHICS,
|
||||
data.pipeline_layout,
|
||||
0,
|
||||
&[data.descriptor_sets[i]],
|
||||
&[],
|
||||
);
|
||||
|
||||
device.cmd_draw_indexed(*command_buffer, buffer::INDICES.len() as u32, 1, 0, 0, 0);
|
||||
|
||||
device.cmd_end_render_pass(*command_buffer);
|
||||
|
||||
|
|
@ -742,87 +814,4 @@ unsafe fn create_sync_objects(device: &Device, data: &mut app_data::AppData) ->
|
|||
.collect();
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
unsafe fn create_buffer(
|
||||
instance: &Instance,
|
||||
device: &Device,
|
||||
data: &app_data::AppData,
|
||||
size: vk::DeviceSize,
|
||||
usage: vk::BufferUsageFlags,
|
||||
properties: vk::MemoryPropertyFlags,
|
||||
) -> Result<(vk::Buffer, vk::DeviceMemory)> {
|
||||
let buffer_info = vk::BufferCreateInfo::builder()
|
||||
.size(size)
|
||||
.usage(usage)
|
||||
.sharing_mode(vk::SharingMode::EXCLUSIVE);
|
||||
|
||||
let buffer = device.create_buffer(&buffer_info, None)?;
|
||||
|
||||
let requirements = device.get_buffer_memory_requirements(buffer);
|
||||
|
||||
let memory_info = vk::MemoryAllocateInfo::builder()
|
||||
.allocation_size(requirements.size)
|
||||
.memory_type_index(get_memory_type_index(
|
||||
instance,
|
||||
data,
|
||||
properties,
|
||||
requirements,
|
||||
)?);
|
||||
|
||||
let buffer_memory = device.allocate_memory(&memory_info, None)?;
|
||||
|
||||
device.bind_buffer_memory(buffer, buffer_memory, 0)?;
|
||||
|
||||
Ok((buffer, buffer_memory))
|
||||
}
|
||||
|
||||
unsafe fn create_vertex_buffer(
|
||||
instance: &Instance,
|
||||
device: &Device,
|
||||
data: &mut app_data::AppData,
|
||||
) -> Result<()> {
|
||||
let size = (size_of::<vertex::Vertex>() * VERTICES.len()) as u64;
|
||||
|
||||
let (vertex_buffer, vertex_buffer_memory) = create_buffer(
|
||||
instance,
|
||||
device,
|
||||
data,
|
||||
size,
|
||||
vk::BufferUsageFlags::VERTEX_BUFFER,
|
||||
vk::MemoryPropertyFlags::HOST_COHERENT | vk::MemoryPropertyFlags::HOST_VISIBLE,
|
||||
)?;
|
||||
|
||||
data.vertex_buffer = vertex_buffer;
|
||||
data.vertex_buffer_memory = vertex_buffer_memory;
|
||||
|
||||
let memory = device.map_memory(
|
||||
vertex_buffer_memory,
|
||||
0,
|
||||
size,
|
||||
vk::MemoryMapFlags::empty(),
|
||||
)?;
|
||||
|
||||
memcpy(VERTICES.as_ptr(), memory.cast(), VERTICES.len());
|
||||
|
||||
device.unmap_memory(vertex_buffer_memory);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
unsafe fn get_memory_type_index(
|
||||
instance: &Instance,
|
||||
data: &app_data::AppData,
|
||||
properties: vk::MemoryPropertyFlags,
|
||||
requirements: vk::MemoryRequirements,
|
||||
) -> Result<u32> {
|
||||
let memory = instance.get_physical_device_memory_properties(data.physical_device);
|
||||
|
||||
(0..memory.memory_type_count)
|
||||
.find(|i| {
|
||||
let suitable = (requirements.memory_type_bits & (1 << i)) != 0;
|
||||
let memory_type = memory.memory_types[*i as usize];
|
||||
suitable && memory_type.property_flags.contains(properties)
|
||||
})
|
||||
.ok_or_else(|| anyhow!("Failed to find suitable memory type."))
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue