summaryrefslogtreecommitdiffstats
path: root/wgpu/src/triangle.rs
diff options
context:
space:
mode:
Diffstat (limited to 'wgpu/src/triangle.rs')
-rw-r--r--wgpu/src/triangle.rs201
1 files changed, 111 insertions, 90 deletions
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 2744c67a..fcab5e3d 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -8,7 +8,7 @@ pub use iced_graphics::triangle::{Mesh2D, Vertex2D};
mod msaa;
-const UNIFORM_BUFFER_SIZE: usize = 100;
+const UNIFORM_BUFFER_SIZE: usize = 50;
const VERTEX_BUFFER_SIZE: usize = 10_000;
const INDEX_BUFFER_SIZE: usize = 10_000;
@@ -41,6 +41,7 @@ impl<T> Buffer<T> {
label: None,
size: (std::mem::size_of::<T>() * size) as u64,
usage,
+ mapped_at_creation: false,
});
Buffer {
@@ -59,6 +60,7 @@ impl<T> Buffer<T> {
label: None,
size: (std::mem::size_of::<T>() * size) as u64,
usage: self.usage,
+ mapped_at_creation: false,
});
self.size = size;
@@ -77,10 +79,16 @@ impl Pipeline {
let constants_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
label: None,
- bindings: &[wgpu::BindGroupLayoutEntry {
+ entries: &[wgpu::BindGroupLayoutEntry {
binding: 0,
visibility: wgpu::ShaderStage::VERTEX,
- ty: wgpu::BindingType::UniformBuffer { dynamic: true },
+ ty: wgpu::BindingType::UniformBuffer {
+ dynamic: true,
+ min_binding_size: wgpu::BufferSize::new(
+ mem::size_of::<Uniforms>() as u64,
+ ),
+ },
+ count: None,
}],
});
@@ -94,35 +102,35 @@ impl Pipeline {
device.create_bind_group(&wgpu::BindGroupDescriptor {
label: None,
layout: &constants_layout,
- bindings: &[wgpu::Binding {
+ entries: &[wgpu::BindGroupEntry {
binding: 0,
- resource: wgpu::BindingResource::Buffer {
- buffer: &constants_buffer.raw,
- range: 0..std::mem::size_of::<Uniforms>() as u64,
- },
+ resource: wgpu::BindingResource::Buffer(
+ constants_buffer
+ .raw
+ .slice(0..std::mem::size_of::<Uniforms>() as u64),
+ ),
}],
});
let layout =
device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
+ label: None,
+ push_constant_ranges: &[],
bind_group_layouts: &[&constants_layout],
});
- let vs = include_bytes!("shader/triangle.vert.spv");
- let vs_module = device.create_shader_module(
- &wgpu::read_spirv(std::io::Cursor::new(&vs[..]))
- .expect("Read triangle vertex shader as SPIR-V"),
- );
+ let vs_module = device.create_shader_module(wgpu::include_spirv!(
+ "shader/triangle.vert.spv"
+ ));
- let fs = include_bytes!("shader/triangle.frag.spv");
- let fs_module = device.create_shader_module(
- &wgpu::read_spirv(std::io::Cursor::new(&fs[..]))
- .expect("Read triangle fragment shader as SPIR-V"),
- );
+ let fs_module = device.create_shader_module(wgpu::include_spirv!(
+ "shader/triangle.frag.spv"
+ ));
let pipeline =
device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
- layout: &layout,
+ label: None,
+ layout: Some(&layout),
vertex_stage: wgpu::ProgrammableStageDescriptor {
module: &vs_module,
entry_point: "main",
@@ -137,6 +145,7 @@ impl Pipeline {
depth_bias: 0,
depth_bias_slope_scale: 0.0,
depth_bias_clamp: 0.0,
+ ..Default::default()
}),
primitive_topology: wgpu::PrimitiveTopology::TriangleList,
color_states: &[wgpu::ColorStateDescriptor {
@@ -204,6 +213,7 @@ impl Pipeline {
pub fn draw(
&mut self,
device: &wgpu::Device,
+ staging_belt: &mut wgpu::util::StagingBelt,
encoder: &mut wgpu::CommandEncoder,
target: &wgpu::TextureView,
target_width: u32,
@@ -236,12 +246,13 @@ impl Pipeline {
device.create_bind_group(&wgpu::BindGroupDescriptor {
label: None,
layout: &self.constants_layout,
- bindings: &[wgpu::Binding {
+ entries: &[wgpu::BindGroupEntry {
binding: 0,
- resource: wgpu::BindingResource::Buffer {
- buffer: &self.uniforms_buffer.raw,
- range: 0..std::mem::size_of::<Uniforms>() as u64,
- },
+ resource: wgpu::BindingResource::Buffer(
+ self.uniforms_buffer.raw.slice(
+ 0..std::mem::size_of::<Uniforms>() as u64,
+ ),
+ ),
}],
});
}
@@ -261,65 +272,85 @@ impl Pipeline {
* Transformation::translate(mesh.origin.x, mesh.origin.y))
.into();
- let vertex_buffer = device.create_buffer_with_data(
- bytemuck::cast_slice(&mesh.buffers.vertices),
- wgpu::BufferUsage::COPY_SRC,
- );
+ let vertices = bytemuck::cast_slice(&mesh.buffers.vertices);
+ let indices = bytemuck::cast_slice(&mesh.buffers.indices);
- let index_buffer = device.create_buffer_with_data(
- mesh.buffers.indices.as_bytes(),
- wgpu::BufferUsage::COPY_SRC,
- );
+ if let Some(vertices_size) =
+ wgpu::BufferSize::new(vertices.len() as u64)
+ {
+ if let Some(indices_size) =
+ wgpu::BufferSize::new(indices.len() as u64)
+ {
+ {
+ let mut vertex_buffer = staging_belt.write_buffer(
+ encoder,
+ &self.vertex_buffer.raw,
+ (std::mem::size_of::<Vertex2D>() * last_vertex)
+ as u64,
+ vertices_size,
+ device,
+ );
+
+ vertex_buffer.copy_from_slice(vertices);
+ }
+
+ {
+ let mut index_buffer = staging_belt.write_buffer(
+ encoder,
+ &self.index_buffer.raw,
+ (std::mem::size_of::<u32>() * last_index) as u64,
+ indices_size,
+ device,
+ );
+
+ index_buffer.copy_from_slice(indices);
+ }
+
+ uniforms.push(transform);
+ offsets.push((
+ last_vertex as u64,
+ last_index as u64,
+ mesh.buffers.indices.len(),
+ ));
+
+ last_vertex += mesh.buffers.vertices.len();
+ last_index += mesh.buffers.indices.len();
+ }
+ }
+ }
- encoder.copy_buffer_to_buffer(
- &vertex_buffer,
- 0,
- &self.vertex_buffer.raw,
- (std::mem::size_of::<Vertex2D>() * last_vertex) as u64,
- (std::mem::size_of::<Vertex2D>() * mesh.buffers.vertices.len())
- as u64,
- );
+ let uniforms = uniforms.as_bytes();
- encoder.copy_buffer_to_buffer(
- &index_buffer,
+ if let Some(uniforms_size) =
+ wgpu::BufferSize::new(uniforms.len() as u64)
+ {
+ let mut uniforms_buffer = staging_belt.write_buffer(
+ encoder,
+ &self.uniforms_buffer.raw,
0,
- &self.index_buffer.raw,
- (std::mem::size_of::<u32>() * last_index) as u64,
- (std::mem::size_of::<u32>() * mesh.buffers.indices.len())
- as u64,
+ uniforms_size,
+ device,
);
- uniforms.push(transform);
- offsets.push((
- last_vertex as u64,
- last_index as u64,
- mesh.buffers.indices.len(),
- ));
-
- last_vertex += mesh.buffers.vertices.len();
- last_index += mesh.buffers.indices.len();
+ uniforms_buffer.copy_from_slice(uniforms);
}
- let uniforms_buffer = device.create_buffer_with_data(
- uniforms.as_bytes(),
- wgpu::BufferUsage::COPY_SRC,
- );
-
- encoder.copy_buffer_to_buffer(
- &uniforms_buffer,
- 0,
- &self.uniforms_buffer.raw,
- 0,
- (std::mem::size_of::<Uniforms>() * uniforms.len()) as u64,
- );
-
{
- let (attachment, resolve_target, load_op) =
+ let (attachment, resolve_target, load) =
if let Some(blit) = &mut self.blit {
let (attachment, resolve_target) =
blit.targets(device, target_width, target_height);
- (attachment, Some(resolve_target), wgpu::LoadOp::Clear)
+ (
+ attachment,
+ Some(resolve_target),
+ wgpu::LoadOp::Clear(wgpu::Color {
+ r: 0.0,
+ g: 0.0,
+ b: 0.0,
+ a: 0.0,
+ }),
+ )
} else {
(target, None, wgpu::LoadOp::Load)
};
@@ -330,14 +361,7 @@ impl Pipeline {
wgpu::RenderPassColorAttachmentDescriptor {
attachment,
resolve_target,
- load_op,
- store_op: wgpu::StoreOp::Store,
- clear_color: wgpu::Color {
- r: 0.0,
- g: 0.0,
- b: 0.0,
- a: 0.0,
- },
+ ops: wgpu::Operations { load, store: true },
},
],
depth_stencil_attachment: None,
@@ -363,20 +387,17 @@ impl Pipeline {
&[(std::mem::size_of::<Uniforms>() * i) as u32],
);
- render_pass.set_index_buffer(
- &self.index_buffer.raw,
- index_offset * std::mem::size_of::<u32>() as u64,
- 0,
- );
+ render_pass.set_index_buffer(self.index_buffer.raw.slice(..));
- render_pass.set_vertex_buffer(
- 0,
- &self.vertex_buffer.raw,
- vertex_offset * std::mem::size_of::<Vertex2D>() as u64,
- 0,
- );
+ render_pass
+ .set_vertex_buffer(0, self.vertex_buffer.raw.slice(..));
- render_pass.draw_indexed(0..indices as u32, 0, 0..1);
+ render_pass.draw_indexed(
+ index_offset as u32
+ ..(index_offset as usize + indices) as u32,
+ vertex_offset as i32,
+ 0..1,
+ );
}
}
generated by cgit (git 2.34.1) at 2025-04-16 04:04:43 +0000