summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/integration/src/main.rs41
-rw-r--r--examples/integration/src/scene.rs8
-rw-r--r--wgpu/Cargo.toml5
-rw-r--r--wgpu/src/image.rs159
-rw-r--r--wgpu/src/image/atlas.rs38
-rw-r--r--wgpu/src/image/vector.rs4
-rw-r--r--wgpu/src/quad.rs152
-rw-r--r--wgpu/src/transformation.rs4
-rw-r--r--wgpu/src/triangle.rs90
-rw-r--r--wgpu/src/triangle/msaa.rs23
-rw-r--r--wgpu/src/window/backend.rs45
-rw-r--r--wgpu/src/window/swap_chain.rs10
12 files changed, 312 insertions, 267 deletions
diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index 1c544449..7203d4b6 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -7,7 +7,9 @@ use scene::Scene;
use iced_wgpu::{
wgpu, window::SwapChain, Primitive, Renderer, Settings, Target,
};
-use iced_winit::{winit, Cache, Clipboard, MouseCursor, Size, UserInterface};
+use iced_winit::{
+ futures, winit, Cache, Clipboard, MouseCursor, Size, UserInterface,
+};
use winit::{
event::{Event, ModifiersState, WindowEvent},
@@ -25,21 +27,29 @@ pub fn main() {
let mut modifiers = ModifiersState::default();
// Initialize WGPU
- let adapter = wgpu::Adapter::request(&wgpu::RequestAdapterOptions {
- power_preference: wgpu::PowerPreference::Default,
- backends: wgpu::BackendBit::PRIMARY,
- })
- .expect("Request adapter");
- let (mut device, mut queue) =
- adapter.request_device(&wgpu::DeviceDescriptor {
- extensions: wgpu::Extensions {
- anisotropic_filtering: false,
+ let surface = wgpu::Surface::create(&window);
+ let (mut device, queue) = futures::executor::block_on(async {
+ let adapter = wgpu::Adapter::request(
+ &wgpu::RequestAdapterOptions {
+ power_preference: wgpu::PowerPreference::Default,
+ compatible_surface: Some(&surface),
},
- limits: wgpu::Limits::default(),
- });
+ wgpu::BackendBit::PRIMARY,
+ )
+ .await
+ .expect("Request adapter");
+
+ adapter
+ .request_device(&wgpu::DeviceDescriptor {
+ extensions: wgpu::Extensions {
+ anisotropic_filtering: false,
+ },
+ limits: wgpu::Limits::default(),
+ })
+ .await
+ });
- let surface = wgpu::Surface::create(&window);
let format = wgpu::TextureFormat::Bgra8UnormSrgb;
let mut swap_chain = {
@@ -168,10 +178,11 @@ pub fn main() {
);
}
- let (frame, viewport) = swap_chain.next_frame();
+ let (frame, viewport) =
+ swap_chain.next_frame().expect("Next frame");
let mut encoder = device.create_command_encoder(
- &wgpu::CommandEncoderDescriptor { todo: 0 },
+ &wgpu::CommandEncoderDescriptor { label: None },
);
// We draw the scene first
diff --git a/examples/integration/src/scene.rs b/examples/integration/src/scene.rs
index efb1921b..22c6812a 100644
--- a/examples/integration/src/scene.rs
+++ b/examples/integration/src/scene.rs
@@ -69,10 +69,12 @@ fn build_pipeline(
let bind_group_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
+ label: None,
bindings: &[],
});
let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
+ label: None,
layout: &bind_group_layout,
bindings: &[],
});
@@ -108,8 +110,10 @@ fn build_pipeline(
write_mask: wgpu::ColorWrite::ALL,
}],
depth_stencil_state: None,
- index_format: wgpu::IndexFormat::Uint16,
- vertex_buffers: &[],
+ vertex_state: wgpu::VertexStateDescriptor {
+ index_format: wgpu::IndexFormat::Uint16,
+ vertex_buffers: &[],
+ },
sample_count: 1,
sample_mask: !0,
alpha_to_coverage_enabled: false,
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index d6659dd3..1e8fecb6 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -12,8 +12,9 @@ svg = ["resvg"]
canvas = ["lyon"]
[dependencies]
-wgpu = "0.4"
-wgpu_glyph = "0.7"
+wgpu = "0.5"
+wgpu_glyph = { version = "0.8", git = "https://github.com/hecrj/wgpu_glyph.git", branch = "update-wgpu" }
+zerocopy = "0.3"
glyph_brush = "0.6"
raw-window-handle = "0.3"
glam = "0.8"
diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index d3603676..7145f3f3 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -12,6 +12,7 @@ use atlas::Atlas;
use iced_native::Rectangle;
use std::cell::RefCell;
use std::mem;
+use zerocopy::AsBytes;
#[cfg(feature = "image")]
use iced_native::image;
@@ -49,21 +50,22 @@ impl Pipeline {
mipmap_filter: wgpu::FilterMode::Linear,
lod_min_clamp: -100.0,
lod_max_clamp: 100.0,
- compare_function: wgpu::CompareFunction::Always,
+ compare: wgpu::CompareFunction::Always,
});
let constant_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
+ label: None,
bindings: &[
- wgpu::BindGroupLayoutBinding {
+ wgpu::BindGroupLayoutEntry {
binding: 0,
visibility: wgpu::ShaderStage::VERTEX,
ty: wgpu::BindingType::UniformBuffer { dynamic: false },
},
- wgpu::BindGroupLayoutBinding {
+ wgpu::BindGroupLayoutEntry {
binding: 1,
visibility: wgpu::ShaderStage::FRAGMENT,
- ty: wgpu::BindingType::Sampler,
+ ty: wgpu::BindingType::Sampler { comparison: false },
},
],
});
@@ -72,15 +74,14 @@ impl Pipeline {
transform: Transformation::identity().into(),
};
- let uniforms_buffer = device
- .create_buffer_mapped(
- 1,
- wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
- )
- .fill_from_slice(&[uniforms]);
+ let uniforms_buffer = device.create_buffer_with_data(
+ uniforms.as_bytes(),
+ wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
+ );
let constant_bind_group =
device.create_bind_group(&wgpu::BindGroupDescriptor {
+ label: None,
layout: &constant_layout,
bindings: &[
wgpu::Binding {
@@ -99,12 +100,14 @@ impl Pipeline {
let texture_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
- bindings: &[wgpu::BindGroupLayoutBinding {
+ label: None,
+ bindings: &[wgpu::BindGroupLayoutEntry {
binding: 0,
visibility: wgpu::ShaderStage::FRAGMENT,
ty: wgpu::BindingType::SampledTexture {
- multisampled: false,
dimension: wgpu::TextureViewDimension::D2,
+ component_type: wgpu::TextureComponentType::Float,
+ multisampled: false,
},
}],
});
@@ -160,63 +163,68 @@ impl Pipeline {
write_mask: wgpu::ColorWrite::ALL,
}],
depth_stencil_state: None,
- index_format: wgpu::IndexFormat::Uint16,
- vertex_buffers: &[
- wgpu::VertexBufferDescriptor {
- stride: mem::size_of::<Vertex>() as u64,
- step_mode: wgpu::InputStepMode::Vertex,
- attributes: &[wgpu::VertexAttributeDescriptor {
- shader_location: 0,
- format: wgpu::VertexFormat::Float2,
- offset: 0,
- }],
- },
- wgpu::VertexBufferDescriptor {
- stride: mem::size_of::<Instance>() as u64,
- step_mode: wgpu::InputStepMode::Instance,
- attributes: &[
- wgpu::VertexAttributeDescriptor {
- shader_location: 1,
+ vertex_state: wgpu::VertexStateDescriptor {
+ index_format: wgpu::IndexFormat::Uint16,
+ vertex_buffers: &[
+ wgpu::VertexBufferDescriptor {
+ stride: mem::size_of::<Vertex>() as u64,
+ step_mode: wgpu::InputStepMode::Vertex,
+ attributes: &[wgpu::VertexAttributeDescriptor {
+ shader_location: 0,
format: wgpu::VertexFormat::Float2,
offset: 0,
- },
- wgpu::VertexAttributeDescriptor {
- shader_location: 2,
- format: wgpu::VertexFormat::Float2,
- offset: 4 * 2,
- },
- wgpu::VertexAttributeDescriptor {
- shader_location: 3,
- format: wgpu::VertexFormat::Float2,
- offset: 4 * 4,
- },
- wgpu::VertexAttributeDescriptor {
- shader_location: 4,
- format: wgpu::VertexFormat::Float2,
- offset: 4 * 6,
- },
- wgpu::VertexAttributeDescriptor {
- shader_location: 5,
- format: wgpu::VertexFormat::Uint,
- offset: 4 * 8,
- },
- ],
- },
- ],
+ }],
+ },
+ wgpu::VertexBufferDescriptor {
+ stride: mem::size_of::<Instance>() as u64,
+ step_mode: wgpu::InputStepMode::Instance,
+ attributes: &[
+ wgpu::VertexAttributeDescriptor {
+ shader_location: 1,
+ format: wgpu::VertexFormat::Float2,
+ offset: 0,
+ },
+ wgpu::VertexAttributeDescriptor {
+ shader_location: 2,
+ format: wgpu::VertexFormat::Float2,
+ offset: 4 * 2,
+ },
+ wgpu::VertexAttributeDescriptor {
+ shader_location: 3,
+ format: wgpu::VertexFormat::Float2,
+ offset: 4 * 4,
+ },
+ wgpu::VertexAttributeDescriptor {
+ shader_location: 4,
+ format: wgpu::VertexFormat::Float2,
+ offset: 4 * 6,
+ },
+ wgpu::VertexAttributeDescriptor {
+ shader_location: 5,
+ format: wgpu::VertexFormat::Uint,
+ offset: 4 * 8,
+ },
+ ],
+ },
+ ],
+ },
sample_count: 1,
sample_mask: !0,
alpha_to_coverage_enabled: false,
});
- let vertices = device
- .create_buffer_mapped(QUAD_VERTS.len(), wgpu::BufferUsage::VERTEX)
- .fill_from_slice(&QUAD_VERTS);
+ let vertices = device.create_buffer_with_data(
+ QUAD_VERTS.as_bytes(),
+ wgpu::BufferUsage::VERTEX,
+ );
- let indices = device
- .create_buffer_mapped(QUAD_INDICES.len(), wgpu::BufferUsage::INDEX)
- .fill_from_slice(&QUAD_INDICES);
+ let indices = device.create_buffer_with_data(
+ QUAD_INDICES.as_bytes(),
+ wgpu::BufferUsage::INDEX,
+ );
let instances = device.create_buffer(&wgpu::BufferDescriptor {
+ label: None,
size: mem::size_of::<Instance>() as u64 * Instance::MAX as u64,
usage: wgpu::BufferUsage::VERTEX | wgpu::BufferUsage::COPY_DST,
});
@@ -224,6 +232,7 @@ impl Pipeline {
let texture_atlas = Atlas::new(device);
let texture = device.create_bind_group(&wgpu::BindGroupDescriptor {
+ label: None,
layout: &texture_layout,
bindings: &[wgpu::Binding {
binding: 0,
@@ -327,6 +336,7 @@ impl Pipeline {
self.texture =
device.create_bind_group(&wgpu::BindGroupDescriptor {
+ label: None,
layout: &self.texture_layout,
bindings: &[wgpu::Binding {
binding: 0,
@@ -339,11 +349,13 @@ impl Pipeline {
self.texture_version = texture_version;
}
- let uniforms_buffer = device
- .create_buffer_mapped(1, wgpu::BufferUsage::COPY_SRC)
- .fill_from_slice(&[Uniforms {
+ let uniforms_buffer = device.create_buffer_with_data(
+ Uniforms {
transform: transformation.into(),
- }]);
+ }
+ .as_bytes(),
+ wgpu::BufferUsage::COPY_SRC,
+ );
encoder.copy_buffer_to_buffer(
&uniforms_buffer,
@@ -353,9 +365,10 @@ impl Pipeline {
std::mem::size_of::<Uniforms>() as u64,
);
- let instances_buffer = device
- .create_buffer_mapped(instances.len(), wgpu::BufferUsage::COPY_SRC)
- .fill_from_slice(&instances);
+ let instances_buffer = device.create_buffer_with_data(
+ instances.as_bytes(),
+ wgpu::BufferUsage::COPY_SRC,
+ );
let mut i = 0;
let total = instances.len();
@@ -394,11 +407,9 @@ impl Pipeline {
render_pass.set_pipeline(&self.pipeline);
render_pass.set_bind_group(0, &self.constants, &[]);
render_pass.set_bind_group(1, &self.texture, &[]);
- render_pass.set_index_buffer(&self.indices, 0);
- render_pass.set_vertex_buffers(
- 0,
- &[(&self.vertices, 0), (&self.instances, 0)],
- );
+ render_pass.set_index_buffer(&self.indices, 0, 0);
+ render_pass.set_vertex_buffer(0, &self.vertices, 0, 0);
+ render_pass.set_vertex_buffer(1, &self.instances, 0, 0);
render_pass.set_scissor_rect(
bounds.x,
@@ -441,7 +452,7 @@ pub enum Handle {
}
#[repr(C)]
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, AsBytes)]
pub struct Vertex {
_position: [f32; 2],
}
@@ -464,7 +475,7 @@ const QUAD_VERTS: [Vertex; 4] = [
];
#[repr(C)]
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, AsBytes)]
struct Instance {
_position: [f32; 2],
_size: [f32; 2],
@@ -478,7 +489,7 @@ impl Instance {
}
#[repr(C)]
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, AsBytes)]
struct Uniforms {
transform: [f32; 16],
}
diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index 86a5ff49..3ce3ce8b 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -28,6 +28,7 @@ impl Atlas {
};
let texture = device.create_texture(&wgpu::TextureDescriptor {
+ label: None,
size: extent,
array_layer_count: 2,
mip_level_count: 1,
@@ -56,17 +57,14 @@ impl Atlas {
self.layers.len()
}
- pub fn upload<C>(
+ pub fn upload(
&mut self,
width: u32,
height: u32,
- data: &[C],
+ data: &[u8],
device: &wgpu::Device,
encoder: &mut wgpu::CommandEncoder,
- ) -> Option<Entry>
- where
- C: Copy + 'static,
- {
+ ) -> Option<Entry> {
let entry = {
let current_size = self.layers.len();
let entry = self.allocate(width, height)?;
@@ -80,9 +78,8 @@ impl Atlas {
log::info!("Allocated atlas entry: {:?}", entry);
- let buffer = device
- .create_buffer_mapped(data.len(), wgpu::BufferUsage::COPY_SRC)
- .fill_from_slice(data);
+ let buffer =
+ device.create_buffer_with_data(data, wgpu::BufferUsage::COPY_SRC);
match &entry {
Entry::Contiguous(allocation) => {
@@ -274,18 +271,14 @@ impl Atlas {
wgpu::BufferCopyView {
buffer,
offset: offset as u64,
- row_pitch: 4 * image_width,
- image_height,
+ bytes_per_row: 4 * image_width,
+ rows_per_image: image_height,
},
wgpu::TextureCopyView {
texture: &self.texture,
array_layer: layer as u32,
mip_level: 0,
- origin: wgpu::Origin3d {
- x: x as f32,
- y: y as f32,
- z: 0.0,
- },
+ origin: wgpu::Origin3d { x, y, z: 0 },
},
extent,
);
@@ -302,6 +295,7 @@ impl Atlas {
}
let new_texture = device.create_texture(&wgpu::TextureDescriptor {
+ label: None,
size: wgpu::Extent3d {
width: SIZE,
height: SIZE,
@@ -331,21 +325,13 @@ impl Atlas {
texture: &self.texture,
array_layer: i as u32,
mip_level: 0,
- origin: wgpu::Origin3d {
- x: 0.0,
- y: 0.0,
- z: 0.0,
- },
+ origin: wgpu::Origin3d { x: 0, y: 0, z: 0 },
},
wgpu::TextureCopyView {
texture: &new_texture,
array_layer: i as u32,
mip_level: 0,
- origin: wgpu::Origin3d {
- x: 0.0,
- y: 0.0,
- z: 0.0,
- },
+ origin: wgpu::Origin3d { x: 0, y: 0, z: 0 },
},
wgpu::Extent3d {
width: SIZE,
diff --git a/wgpu/src/image/vector.rs b/wgpu/src/image/vector.rs
index b6776827..7648aa7e 100644
--- a/wgpu/src/image/vector.rs
+++ b/wgpu/src/image/vector.rs
@@ -2,6 +2,8 @@ use crate::image::atlas::{self, Atlas};
use iced_native::svg;
use std::collections::{HashMap, HashSet};
+use zerocopy::AsBytes;
+
pub enum Svg {
Loaded(resvg::usvg::Tree),
NotFound,
@@ -117,7 +119,7 @@ impl Cache {
let allocation = texture_atlas.upload(
width,
height,
- canvas.get_data(),
+ canvas.get_data().as_bytes(),
device,
encoder,
)?;
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 9047080d..261d1d94 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -2,6 +2,7 @@ use crate::Transformation;
use iced_native::Rectangle;
use std::mem;
+use zerocopy::AsBytes;
#[derive(Debug)]
pub struct Pipeline {
@@ -20,21 +21,21 @@ impl Pipeline {
) -> Pipeline {
let constant_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
- bindings: &[wgpu::BindGroupLayoutBinding {
+ label: None,
+ bindings: &[wgpu::BindGroupLayoutEntry {
binding: 0,
visibility: wgpu::ShaderStage::VERTEX,
ty: wgpu::BindingType::UniformBuffer { dynamic: false },
}],
});
- let constants_buffer = device
- .create_buffer_mapped(
- 1,
- wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
- )
- .fill_from_slice(&[Uniforms::default()]);
+ let constants_buffer = device.create_buffer_with_data(
+ Uniforms::default().as_bytes(),
+ wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
+ );
let constants = device.create_bind_group(&wgpu::BindGroupDescriptor {
+ label: None,
layout: &constant_layout,
bindings: &[wgpu::Binding {
binding: 0,
@@ -96,68 +97,73 @@ impl Pipeline {
write_mask: wgpu::ColorWrite::ALL,
}],
depth_stencil_state: None,
- index_format: wgpu::IndexFormat::Uint16,
- vertex_buffers: &[
- wgpu::VertexBufferDescriptor {
- stride: mem::size_of::<Vertex>() as u64,
- step_mode: wgpu::InputStepMode::Vertex,
- attributes: &[wgpu::VertexAttributeDescriptor {
- shader_location: 0,
- format: wgpu::VertexFormat::Float2,
- offset: 0,
- }],
- },
- wgpu::VertexBufferDescriptor {
- stride: mem::size_of::<Quad>() as u64,
- step_mode: wgpu::InputStepMode::Instance,
- attributes: &[
- wgpu::VertexAttributeDescriptor {
- shader_location: 1,
+ vertex_state: wgpu::VertexStateDescriptor {
+ index_format: wgpu::IndexFormat::Uint16,
+ vertex_buffers: &[
+ wgpu::VertexBufferDescriptor {
+ stride: mem::size_of::<Vertex>() as u64,
+ step_mode: wgpu::InputStepMode::Vertex,
+ attributes: &[wgpu::VertexAttributeDescriptor {
+ shader_location: 0,
format: wgpu::VertexFormat::Float2,
offset: 0,
- },
- wgpu::VertexAttributeDescriptor {
- shader_location: 2,
- format: wgpu::VertexFormat::Float2,
- offset: 4 * 2,
- },
- wgpu::VertexAttributeDescriptor {
- shader_location: 3,
- format: wgpu::VertexFormat::Float4,
- offset: 4 * (2 + 2),
- },
- wgpu::VertexAttributeDescriptor {
- shader_location: 4,
- format: wgpu::VertexFormat::Float4,
- offset: 4 * (2 + 2 + 4),
- },
- wgpu::VertexAttributeDescriptor {
- shader_location: 5,
- format: wgpu::VertexFormat::Float,
- offset: 4 * (2 + 2 + 4 + 4),
- },
- wgpu::VertexAttributeDescriptor {
- shader_location: 6,
- format: wgpu::VertexFormat::Float,
- offset: 4 * (2 + 2 + 4 + 4 + 1),
- },
- ],
- },
- ],
+ }],
+ },
+ wgpu::VertexBufferDescriptor {
+ stride: mem::size_of::<Quad>() as u64,
+ step_mode: wgpu::InputStepMode::Instance,
+ attributes: &[
+ wgpu::VertexAttributeDescriptor {
+ shader_location: 1,
+ format: wgpu::VertexFormat::Float2,
+ offset: 0,
+ },
+ wgpu::VertexAttributeDescriptor {
+ shader_location: 2,
+ format: wgpu::VertexFormat::Float2,
+ offset: 4 * 2,
+ },
+ wgpu::VertexAttributeDescriptor {
+ shader_location: 3,
+ format: wgpu::VertexFormat::Float4,
+ offset: 4 * (2 + 2),
+ },
+ wgpu::VertexAttributeDescriptor {
+ shader_location: 4,
+ format: wgpu::VertexFormat::Float4,
+ offset: 4 * (2 + 2 + 4),
+ },
+ wgpu::VertexAttributeDescriptor {
+ shader_location: 5,
+ format: wgpu::VertexFormat::Float,
+ offset: 4 * (2 + 2 + 4 + 4),
+ },
+ wgpu::VertexAttributeDescriptor {
+ shader_location: 6,
+ format: wgpu::VertexFormat::Float,
+ offset: 4 * (2 + 2 + 4 + 4 + 1),
+ },
+ ],
+ },
+ ],
+ },
sample_count: 1,
sample_mask: !0,
alpha_to_coverage_enabled: false,
});
- let vertices = device
- .create_buffer_mapped(QUAD_VERTS.len(), wgpu::BufferUsage::VERTEX)
- .fill_from_slice(&QUAD_VERTS);
+ let vertices = device.create_buffer_with_data(
+ QUAD_VERTS.as_bytes(),
+ wgpu::BufferUsage::VERTEX,
+ );
- let indices = device
- .create_buffer_mapped(QUAD_INDICES.len(), wgpu::BufferUsage::INDEX)
- .fill_from_slice(&QUAD_INDICES);
+ let indices = device.create_buffer_with_data(
+ QUAD_INDICES.as_bytes(),
+ wgpu::BufferUsage::INDEX,
+ );
let instances = device.create_buffer(&wgpu::BufferDescriptor {
+ label: None,
size: mem::size_of::<Quad>() as u64 * Quad::MAX as u64,
usage: wgpu::BufferUsage::VERTEX | wgpu::BufferUsage::COPY_DST,
});
@@ -184,9 +190,10 @@ impl Pipeline {
) {
let uniforms = Uniforms::new(transformation, scale);
- let constants_buffer = device
- .create_buffer_mapped(1, wgpu::BufferUsage::COPY_SRC)
- .fill_from_slice(&[uniforms]);
+ let constants_buffer = device.create_buffer_with_data(
+ uniforms.as_bytes(),
+ wgpu::BufferUsage::COPY_SRC,
+ );
encoder.copy_buffer_to_buffer(
&constants_buffer,
@@ -203,9 +210,10 @@ impl Pipeline {
let end = (i + Quad::MAX).min(total);
let amount = end - i;
- let instance_buffer = device
- .create_buffer_mapped(amount, wgpu::BufferUsage::COPY_SRC)
- .fill_from_slice(&instances[i..end]);
+ let instance_buffer = device.create_buffer_with_data(
+ &instances[i..end].as_bytes(),
+ wgpu::BufferUsage::COPY_SRC,
+ );
encoder.copy_buffer_to_buffer(
&instance_buffer,
@@ -237,11 +245,9 @@ impl Pipeline {
render_pass.set_pipeline(&self.pipeline);
render_pass.set_bind_group(0, &self.constants, &[]);
- render_pass.set_index_buffer(&self.indices, 0);
- render_pass.set_vertex_buffers(
- 0,
- &[(&self.vertices, 0), (&self.instances, 0)],
- );
+ render_pass.set_index_buffer(&self.indices, 0, 0);
+ render_pass.set_vertex_buffer(0, &self.vertices, 0, 0);
+ render_pass.set_vertex_buffer(1, &self.instances, 0, 0);
render_pass.set_scissor_rect(
bounds.x,
bounds.y,
@@ -263,7 +269,7 @@ impl Pipeline {
}
#[repr(C)]
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, AsBytes)]
pub struct Vertex {
_position: [f32; 2],
}
@@ -286,7 +292,7 @@ const QUAD_VERTS: [Vertex; 4] = [
];
#[repr(C)]
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, AsBytes)]
pub struct Quad {
pub position: [f32; 2],
pub scale: [f32; 2],
@@ -301,7 +307,7 @@ impl Quad {
}
#[repr(C)]
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, AsBytes)]
struct Uniforms {
transform: [f32; 16],
scale: f32,
diff --git a/wgpu/src/transformation.rs b/wgpu/src/transformation.rs
index c991f330..ff3b1d00 100644
--- a/wgpu/src/transformation.rs
+++ b/wgpu/src/transformation.rs
@@ -16,9 +16,9 @@ impl Transformation {
pub fn orthographic(width: u32, height: u32) -> Transformation {
Transformation(Mat4::from_cols(
Vec4::new(2.0 / width as f32, 0.0, 0.0, 0.0),
- Vec4::new(0.0, 2.0 / height as f32, 0.0, 0.0),
+ Vec4::new(0.0, -2.0 / height as f32, 0.0, 0.0),
Vec4::new(0.0, 0.0, -1.0, 0.0),
- Vec4::new(-1.0, -1.0, 0.0, 1.0)
+ Vec4::new(-1.0, 1.0, 0.0, 1.0)
))
}
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 51a6f954..471abe22 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -2,6 +2,7 @@
use crate::{settings, Transformation};
use iced_native::{Point, Rectangle};
use std::mem;
+use zerocopy::AsBytes;
mod msaa;
@@ -34,6 +35,7 @@ impl<T> Buffer<T> {
usage: wgpu::BufferUsage,
) -> Self {
let raw = device.create_buffer(&wgpu::BufferDescriptor {
+ label: None,
size: (std::mem::size_of::<T>() * size) as u64,
usage,
});
@@ -49,6 +51,7 @@ impl<T> Buffer<T> {
pub fn ensure_capacity(&mut self, device: &wgpu::Device, size: usize) {
if self.size < size {
self.raw = device.create_buffer(&wgpu::BufferDescriptor {
+ label: None,
size: (std::mem::size_of::<T>() * size) as u64,
usage: self.usage,
});
@@ -66,7 +69,8 @@ impl Pipeline {
) -> Pipeline {
let constant_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
- bindings: &[wgpu::BindGroupLayoutBinding {
+ label: None,
+ bindings: &[wgpu::BindGroupLayoutEntry {
binding: 0,
visibility: wgpu::ShaderStage::VERTEX,
ty: wgpu::BindingType::UniformBuffer { dynamic: true },
@@ -81,6 +85,7 @@ impl Pipeline {
let constant_bind_group =
device.create_bind_group(&wgpu::BindGroupDescriptor {
+ label: None,
layout: &constant_layout,
bindings: &[wgpu::Binding {
binding: 0,
@@ -142,25 +147,27 @@ impl Pipeline {
write_mask: wgpu::ColorWrite::ALL,
}],
depth_stencil_state: None,
- index_format: wgpu::IndexFormat::Uint32,
- vertex_buffers: &[wgpu::VertexBufferDescriptor {
- stride: mem::size_of::<Vertex2D>() as u64,
- step_mode: wgpu::InputStepMode::Vertex,
- attributes: &[
- // Position
- wgpu::VertexAttributeDescriptor {
- shader_location: 0,
- format: wgpu::VertexFormat::Float2,
- offset: 0,
- },
- // Color
- wgpu::VertexAttributeDescriptor {
- shader_location: 1,
- format: wgpu::VertexFormat::Float4,
- offset: 4 * 2,
- },
- ],
- }],
+ vertex_state: wgpu::VertexStateDescriptor {
+ index_format: wgpu::IndexFormat::Uint32,
+ vertex_buffers: &[wgpu::VertexBufferDescriptor {
+ stride: mem::size_of::<Vertex2D>() as u64,
+ step_mode: wgpu::InputStepMode::Vertex,
+ attributes: &[
+ // Position
+ wgpu::VertexAttributeDescriptor {
+ shader_location: 0,
+ format: wgpu::VertexFormat::Float2,
+ offset: 0,
+ },
+ // Color
+ wgpu::VertexAttributeDescriptor {
+ shader_location: 1,
+ format: wgpu::VertexFormat::Float4,
+ offset: 4 * 2,
+ },
+ ],
+ }],
+ },
sample_count: antialiasing
.map(|a| a.sample_count())
.unwrap_or(1),
@@ -230,19 +237,15 @@ impl Pipeline {
.into(),
};
- let vertex_buffer = device
- .create_buffer_mapped(
- mesh.vertices.len(),
- wgpu::BufferUsage::COPY_SRC,
- )
- .fill_from_slice(&mesh.vertices);
+ let vertex_buffer = device.create_buffer_with_data(
+ mesh.vertices.as_bytes(),
+ wgpu::BufferUsage::COPY_SRC,
+ );
- let index_buffer = device
- .create_buffer_mapped(
- mesh.indices.len(),
- wgpu::BufferUsage::COPY_SRC,
- )
- .fill_from_slice(&mesh.indices);
+ let index_buffer = device.create_buffer_with_data(
+ mesh.indices.as_bytes(),
+ wgpu::BufferUsage::COPY_SRC,
+ );
encoder.copy_buffer_to_buffer(
&vertex_buffer,
@@ -271,9 +274,10 @@ impl Pipeline {
last_index += mesh.indices.len();
}
- let uniforms_buffer = device
- .create_buffer_mapped(uniforms.len(), wgpu::BufferUsage::COPY_SRC)
- .fill_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,
@@ -327,20 +331,20 @@ impl Pipeline {
render_pass.set_bind_group(
0,
&self.constants,
- &[(std::mem::size_of::<Uniforms>() * i) as u64],
+ &[(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_vertex_buffers(
+ render_pass.set_vertex_buffer(
+ 0,
+ &self.vertex_buffer.raw,
+ vertex_offset * std::mem::size_of::<Vertex2D>() as u64,
0,
- &[(
- &self.vertex_buffer.raw,
- vertex_offset * std::mem::size_of::<Vertex2D>() as u64,
- )],
);
render_pass.draw_indexed(0..indices as u32, 0, 0..1);
@@ -354,7 +358,7 @@ impl Pipeline {
}
#[repr(C)]
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, AsBytes)]
struct Uniforms {
transform: [f32; 16],
}
@@ -369,7 +373,7 @@ impl Default for Uniforms {
/// A two-dimensional vertex with some color in __linear__ RGBA.
#[repr(C)]
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, AsBytes)]
pub struct Vertex2D {
/// The vertex position
pub position: [f32; 2],
diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs
index f65f0a00..f52c888b 100644
--- a/wgpu/src/triangle/msaa.rs
+++ b/wgpu/src/triangle/msaa.rs
@@ -25,20 +25,22 @@ impl Blit {
mipmap_filter: wgpu::FilterMode::Linear,
lod_min_clamp: -100.0,
lod_max_clamp: 100.0,
- compare_function: wgpu::CompareFunction::Always,
+ compare: wgpu::CompareFunction::Always,
});
let constant_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
- bindings: &[wgpu::BindGroupLayoutBinding {
+ label: None,
+ bindings: &[wgpu::BindGroupLayoutEntry {
binding: 0,
visibility: wgpu::ShaderStage::FRAGMENT,
- ty: wgpu::BindingType::Sampler,
+ ty: wgpu::BindingType::Sampler { comparison: false },
}],
});
let constant_bind_group =
device.create_bind_group(&wgpu::BindGroupDescriptor {
+ label: None,
layout: &constant_layout,
bindings: &[wgpu::Binding {
binding: 0,
@@ -48,12 +50,14 @@ impl Blit {
let texture_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
- bindings: &[wgpu::BindGroupLayoutBinding {
+ label: None,
+ bindings: &[wgpu::BindGroupLayoutEntry {
binding: 0,
visibility: wgpu::ShaderStage::FRAGMENT,
ty: wgpu::BindingType::SampledTexture {
- multisampled: false,
dimension: wgpu::TextureViewDimension::D2,
+ component_type: wgpu::TextureComponentType::Float,
+ multisampled: false,
},
}],
});
@@ -109,8 +113,10 @@ impl Blit {
write_mask: wgpu::ColorWrite::ALL,
}],
depth_stencil_state: None,
- index_format: wgpu::IndexFormat::Uint16,
- vertex_buffers: &[],
+ vertex_state: wgpu::VertexStateDescriptor {
+ index_format: wgpu::IndexFormat::Uint16,
+ vertex_buffers: &[],
+ },
sample_count: 1,
sample_mask: !0,
alpha_to_coverage_enabled: false,
@@ -222,6 +228,7 @@ impl Targets {
};
let attachment = device.create_texture(&wgpu::TextureDescriptor {
+ label: None,
size: extent,
array_layer_count: 1,
mip_level_count: 1,
@@ -232,6 +239,7 @@ impl Targets {
});
let resolve = device.create_texture(&wgpu::TextureDescriptor {
+ label: None,
size: extent,
array_layer_count: 1,
mip_level_count: 1,
@@ -246,6 +254,7 @@ impl Targets {
let resolve = resolve.create_default_view();
let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
+ label: None,
layout: texture_layout,
bindings: &[wgpu::Binding {
binding: 0,
diff --git a/wgpu/src/window/backend.rs b/wgpu/src/window/backend.rs
index 5b269f36..e1b77700 100644
--- a/wgpu/src/window/backend.rs
+++ b/wgpu/src/window/backend.rs
@@ -1,6 +1,6 @@
use crate::{window::SwapChain, Renderer, Settings, Target};
-use iced_native::MouseCursor;
+use iced_native::{futures, MouseCursor};
use raw_window_handle::HasRawWindowHandle;
/// A window graphics backend for iced powered by `wgpu`.
@@ -18,23 +18,30 @@ impl iced_native::window::Backend for Backend {
type SwapChain = SwapChain;
fn new(settings: Self::Settings) -> (Backend, Renderer) {
- let adapter = wgpu::Adapter::request(&wgpu::RequestAdapterOptions {
- power_preference: if settings.antialiasing.is_none() {
- wgpu::PowerPreference::Default
- } else {
- wgpu::PowerPreference::HighPerformance
- },
- backends: wgpu::BackendBit::all(),
- })
- .expect("Request adapter");
-
- let (mut device, queue) =
- adapter.request_device(&wgpu::DeviceDescriptor {
- extensions: wgpu::Extensions {
- anisotropic_filtering: false,
+ let (mut device, queue) = futures::executor::block_on(async {
+ let adapter = wgpu::Adapter::request(
+ &wgpu::RequestAdapterOptions {
+ power_preference: if settings.antialiasing.is_none() {
+ wgpu::PowerPreference::Default
+ } else {
+ wgpu::PowerPreference::HighPerformance
+ },
+ compatible_surface: None,
},
- limits: wgpu::Limits { max_bind_groups: 2 },
- });
+ wgpu::BackendBit::all(),
+ )
+ .await
+ .expect("Request adapter");
+
+ adapter
+ .request_device(&wgpu::DeviceDescriptor {
+ extensions: wgpu::Extensions {
+ anisotropic_filtering: false,
+ },
+ limits: wgpu::Limits { max_bind_groups: 2 },
+ })
+ .await
+ });
let renderer = Renderer::new(&mut device, settings);
@@ -72,10 +79,10 @@ impl iced_native::window::Backend for Backend {
scale_factor: f64,
overlay: &[T],
) -> MouseCursor {
- let (frame, viewport) = swap_chain.next_frame();
+ let (frame, viewport) = swap_chain.next_frame().expect("Next frame");
let mut encoder = self.device.create_command_encoder(
- &wgpu::CommandEncoderDescriptor { todo: 0 },
+ &wgpu::CommandEncoderDescriptor { label: None },
);
let _ = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
diff --git a/wgpu/src/window/swap_chain.rs b/wgpu/src/window/swap_chain.rs
index 4ca2901b..72e58a50 100644
--- a/wgpu/src/window/swap_chain.rs
+++ b/wgpu/src/window/swap_chain.rs
@@ -32,8 +32,12 @@ impl SwapChain {
///
/// [`SwapChain`]: struct.SwapChain.html
/// [`Viewport`]: ../struct.Viewport.html
- pub fn next_frame(&mut self) -> (wgpu::SwapChainOutput<'_>, &Viewport) {
- (self.raw.get_next_texture(), &self.viewport)
+ pub fn next_frame(
+ &mut self,
+ ) -> Result<(wgpu::SwapChainOutput, &Viewport), wgpu::TimeOut> {
+ let viewport = &self.viewport;
+
+ self.raw.get_next_texture().map(|output| (output, viewport))
}
}
@@ -51,7 +55,7 @@ fn new_swap_chain(
format,
width,
height,
- present_mode: wgpu::PresentMode::Vsync,
+ present_mode: wgpu::PresentMode::Mailbox,
},
)
}
generated by cgit (git 2.34.1) at 2025-04-15 23:11:58 +0000