JustForFun/vulkano_test
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use vulkano_util instead
Some checks failed
Build legacy Nix package on Ubuntu / build (push) Failing after 6m30s

Browse source
This commit is contained in:
Florian RICHER 2025-05-25 19:48:59 +02:00
parent f486486be3
commit a4a6c0c60a
Signed by: florian.richer
GPG key ID: C73D37CBED7BFC77
9 changed files with 137 additions and 415 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/render/scene.rs
View file

@ -6,14 +6,14 @@ use std::time::Instant;
use vulkano::buffer::{Buffer, BufferCreateInfo, BufferUsage, Subbuffer};
use vulkano::command_buffer::{AutoCommandBufferBuilder, PrimaryAutoCommandBuffer};
use vulkano::descriptor_set::{DescriptorSet, WriteDescriptorSet};
use vulkano::memory::allocator::{AllocationCreateInfo, MemoryTypeFilter};
use vulkano::memory::allocator::{AllocationCreateInfo, MemoryTypeFilter, StandardMemoryAllocator};
use vulkano::pipeline::{GraphicsPipeline, Pipeline, PipelineBindPoint};
use vulkano_util::renderer::VulkanoWindowRenderer;
use crate::render::vertex::Vertex2D;
use crate::render::pipelines::triangle_pipeline::create_triangle_pipeline;
use crate::render::vertex::Vertex2D;
use super::vulkan_context::VulkanContext;
use super::window_render_context::WindowRenderContext;
const VERTICES: [Vertex2D; 12] = [
// Triangle en haut à gauche
@ -79,13 +79,17 @@ pub struct Scene {
impl Scene {
pub fn load(
vulkan_context: &VulkanContext,
window_render_context: &WindowRenderContext,
vulkano_context: &VulkanContext,
vulkano_window_renderer: &VulkanoWindowRenderer,
) -> Result<Self, Box<dyn Error>> {
let pipeline =
create_triangle_pipeline(&vulkan_context.device, &window_render_context.swapchain)?;
let vertex_buffer =
Vertex2D::create_buffer(Vec::from_iter(VERTICES), &vulkan_context.memory_allocator)?;
let pipeline = create_triangle_pipeline(
&vulkano_context.vulkano_context().device(),
vulkano_window_renderer.swapchain_format(),
)?;
let vertex_buffer = Vertex2D::create_buffer(
Vec::from_iter(VERTICES),
&vulkano_context.vulkano_context().memory_allocator(),
)?;
Ok(Scene {
pipeline,
@ -97,16 +101,19 @@ impl Scene {
pub fn render(
&self,
vulkan_context: &VulkanContext,
window_render_context: &WindowRenderContext,
vulkano_window_renderer: &VulkanoWindowRenderer,
builder: &mut AutoCommandBufferBuilder<PrimaryAutoCommandBuffer>,
) -> Result<(), Box<dyn Error>> {
let vertex_count = self.vertex_buffer.len() as u32;
let instance_count = vertex_count / 3;
let uniform_buffer = self.get_uniform_buffer(vulkan_context, window_render_context);
let uniform_buffer = self.get_uniform_buffer(
&vulkan_context.vulkano_context().memory_allocator(),
vulkano_window_renderer.aspect_ratio(),
);
let layout = &self.pipeline.layout().set_layouts()[0];
let descriptor_set = DescriptorSet::new(
vulkan_context.descriptor_set_allocator.clone(),
vulkan_context.descriptor_set_allocator().clone(),
layout.clone(),
[WriteDescriptorSet::buffer(0, uniform_buffer)],
[],
@ -131,18 +138,15 @@ impl Scene {
fn get_uniform_buffer(
&self,
vulkan_context: &VulkanContext,
window_render_context: &WindowRenderContext,
memory_allocator: &Arc<StandardMemoryAllocator>,
aspect_ratio: f32,
) -> Subbuffer<vs::MVPData> {
let swapchain = &window_render_context.swapchain;
let elapsed = self.rotation_start.elapsed();
let rotation = elapsed.as_secs() as f64 + elapsed.subsec_nanos() as f64 / 1_000_000_000.0;
let rotation = Mat3::from_rotation_y(rotation as f32);
// NOTE: This teapot was meant for OpenGL where the origin is at the lower left
// instead the origin is at the upper left in Vulkan, so we reverse the Y axis.
let aspect_ratio = swapchain.image_extent()[0] as f32 / swapchain.image_extent()[1] as f32;
let proj = Mat4::perspective_rh_gl(std::f32::consts::FRAC_PI_2, aspect_ratio, 0.01, 100.0);
let view = Mat4::look_at_rh(
Vec3::new(0.3, 0.3, 1.0),
@ -158,7 +162,7 @@ impl Scene {
};
Buffer::from_data(
vulkan_context.memory_allocator.clone(),
memory_allocator.clone(),
BufferCreateInfo {
usage: BufferUsage::UNIFORM_BUFFER,
..Default::default()