janis/vidya
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

compiles!

Browse source
This commit is contained in:
janis 2026-04-12 21:12:00 +02:00
parent a297dd94da
commit 933b4a5979
Signed by: janis
SSH key fingerprint: SHA256:bB1qbbqmDXZNT0KKD5c2Dfjg53JGhj7B3CFcLIzSqq8
5 changed files with 25 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/renderer/src/egui.rs
View file

@ -631,7 +631,6 @@ pub fn egui_pass(
let record: Box<RecordFn> = Box::new({
let pipeline = egui_state.pipeline.clone();
let pipeline_layout = egui_state.pipeline_layout.clone();
let descriptor_set = egui_state.descriptor_set;
let screen_rect = egui.screen_rect();
@ -733,7 +732,7 @@ pub fn egui_pass(
cmd.bind_indices(indices.raw(), 0, vk::IndexType::UINT32);
cmd.bind_vertex_buffers(&[vertices.raw()], &[0]);
cmd.push_constants(
&pipeline_layout,
pipeline.layout(),
vk::ShaderStageFlags::VERTEX,
0,
bytemuck::cast_slice(
@ -741,7 +740,7 @@ pub fn egui_pass(
),
);
cmd.bind_descriptor_sets(
&pipeline_layout,
pipeline.layout(),
vk::PipelineBindPoint::GRAPHICS,
&[descriptor_set],
);

8
crates/renderer/src/lib.rs
View file

@ -690,7 +690,6 @@ pub struct EguiState {
descriptor_set: vk::DescriptorSet,
#[allow(unused)]
descriptor_layout: pipeline::DescriptorSetLayout,
pipeline_layout: Arc<pipeline::PipelineLayout>,
pipeline: Arc<pipeline::Pipeline>,
}
@ -789,7 +788,7 @@ impl EguiState {
Result::Ok((descriptor_pool, descriptor_layout, sets))
})?;
let pipeline_layout = pipeline::PipelineLayout::new(
let pipeline_layout = Arc::new(pipeline::PipelineLayout::new(
device.clone(),
pipeline::PipelineLayoutDesc {
descriptor_set_layouts: &[&descriptor_layout],
@ -800,7 +799,7 @@ impl EguiState {
}],
name: Some("egui-pipeline-layout".into()),
},
)?;
)?);
let frag_shader = pipeline::ShaderModule::new_from_path(
device.clone(),
@ -831,7 +830,7 @@ impl EguiState {
},
],
render_pass: None,
layout: &pipeline_layout,
layout: pipeline_layout,
subpass: None,
base_pipeline: None,
vertex_input: Some(pipeline::VertexInputState {
@ -915,7 +914,6 @@ impl EguiState {
descriptor_layout,
descriptor_set: sets[0],
pipeline: Arc::new(pipeline),
pipeline_layout: Arc::new(pipeline_layout),
})
}

4
crates/renderer/src/render_graph/commands.rs
View file

@ -602,8 +602,8 @@ impl<T: Resource, U: Resource> OutsideRenderPass for Copy<T, U> {}
impl OutsideRenderPass for ClearTexture {}
impl OutsideRenderPass for UpdateBuffer {}
impl InsideRenderPass for BindPipeline {}
impl OutsideRenderPass for BindPipeline {}
impl InsideRenderPass for BindPipeline<'_> {}
impl OutsideRenderPass for BindPipeline<'_> {}
impl InsideRenderPass for BindVertexBuffers {}
impl OutsideRenderPass for BindVertexBuffers {}
impl InsideRenderPass for BindIndexBuffer {}

22
crates/renderer/src/render_graph/recorder.rs
View file

@ -97,40 +97,40 @@ impl<'a> SideEffectMap<'a> {
}
}
pub struct CommandList {
pub struct CommandList<'cmd> {
command_bytes: Vec<MaybeUninit<u8>>,
cursor: usize,
// each command that accesses a resource adds an entry to this map (id, command_index) -> access
// during command recording, we fold accesses to the same resource as commands are recorded, and when a command reads a resource, we check for any previous writes to be made available/visible
side_effects: SideEffects,
num_commands: u32,
_pd: PhantomData<fn(&'cmd ())>,
}
#[must_use]
pub struct RenderPass<'a> {
cmd_list: &'a mut CommandList,
pub struct RenderPass<'cmd, 'a> {
cmd_list: &'a mut CommandList<'cmd>,
}
impl<'a> RenderPass<'a> {
impl<'cmd, 'a> RenderPass<'cmd, 'a> {
pub fn finalise(self) {
self.cmd_list.push_inner(super::commands::EndRendering);
}
pub fn push<'c, C: Command + InsideRenderPass + 'c>(&mut self, command: C)
where
'c: 'a,
{
pub fn push<C: Command + InsideRenderPass + 'cmd>(&mut self, command: C) {
self.cmd_list.push_inner(command);
}
}
impl CommandList {
impl<'cmd> CommandList<'cmd> {
pub fn new() -> Self {
Self {
command_bytes: Vec::new(),
cursor: 0,
side_effects: SideEffects::default(),
num_commands: 0,
_pd: PhantomData,
}
}
@ -141,7 +141,7 @@ impl CommandList {
stencil_attachment: Option<TextureRegion>,
area: (u32, u32),
layers: u32,
) -> RenderPass<'_> {
) -> RenderPass<'cmd, '_> {
self.push(super::commands::BeginRendering {
color_attachments,
depth_attachment,
@ -152,7 +152,7 @@ impl CommandList {
RenderPass { cmd_list: self }
}
pub fn push<C: Command + OutsideRenderPass>(&mut self, command: C) {
pub fn push<C: Command + OutsideRenderPass + 'cmd>(&mut self, command: C) {
self.push_inner(command);
}

17
crates/renderer/src/rendering/mod.rs
View file

@ -26,7 +26,6 @@ pub struct Wireframe {
num_indices: u32,
colors: Arc<Buffer>,
pipeline: Arc<pipeline::Pipeline>,
layout: Arc<pipeline::PipelineLayout>,
}
impl Wireframe {
@ -168,7 +167,7 @@ impl Wireframe {
Arc::new(sync::Fence::from_pool(&dev.pools.fences, None)?),
)?;
let (pipeline, layout) = Self::create_pipeline(dev.clone())?;
let pipeline = Self::create_pipeline(dev.clone())?;
future.await;
@ -177,13 +176,12 @@ impl Wireframe {
indices: Arc::new(indices),
colors: Arc::new(colors),
pipeline: Arc::new(pipeline),
layout: Arc::new(layout),
num_indices,
})
}
fn create_pipeline(device: Device) -> Result<(pipeline::Pipeline, pipeline::PipelineLayout)> {
let pipeline_layout = pipeline::PipelineLayout::new(
fn create_pipeline(device: Device) -> Result<pipeline::Pipeline> {
let pipeline_layout = Arc::new(pipeline::PipelineLayout::new(
device.clone(),
pipeline::PipelineLayoutDesc {
descriptor_set_layouts: &[],
@ -194,7 +192,7 @@ impl Wireframe {
}],
name: Some("wireframe-pipeline-layout".into()),
},
)?;
)?);
let shader = pipeline::ShaderModule::new_from_path(
device.clone(),
@ -221,7 +219,7 @@ impl Wireframe {
},
],
render_pass: None,
layout: &pipeline_layout,
layout: pipeline_layout,
subpass: None,
base_pipeline: None,
vertex_input: Some(pipeline::VertexInputState {
@ -301,7 +299,7 @@ impl Wireframe {
},
)?;
Ok((pipeline, pipeline_layout))
Ok(pipeline)
}
pub fn pass(&self, rg: &mut RenderGraph, target: GraphResourceId) -> Result<()> {
@ -315,7 +313,6 @@ impl Wireframe {
let num_indices = self.num_indices;
let pipeline = self.pipeline.clone();
let layout = self.layout.clone();
move |ctx: &RenderContext| -> Result<()> {
let target = ctx.get_image(target).unwrap();
@ -361,7 +358,7 @@ impl Wireframe {
cmd.bind_indices(indices.raw(), 0, vk::IndexType::UINT32);
cmd.bind_vertex_buffers(&[positions.raw(), colors.raw()], &[0, 0]);
cmd.push_constants(
&layout,
&pipeline.layout(),
vk::ShaderStageFlags::VERTEX,
0,
bytemuck::cast_slice(&[to_clip]),