summaryrefslogtreecommitdiffstats
path: root/wgpu
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--wgpu/src/backend.rs2
-rw-r--r--wgpu/src/image.rs8
-rw-r--r--wgpu/src/image/atlas.rs2
-rw-r--r--wgpu/src/image/atlas/layer.rs5
-rw-r--r--wgpu/src/image/raster.rs2
-rw-r--r--wgpu/src/image/vector.rs4
-rw-r--r--wgpu/src/text.rs3
-rw-r--r--wgpu/src/triangle.rs74
-rw-r--r--wgpu/src/triangle/msaa.rs4
-rw-r--r--wgpu/src/window/compositor.rs2
10 files changed, 49 insertions, 57 deletions
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 05b4af9b..b0aa13fe 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -93,7 +93,7 @@ impl Backend {
&layer,
staging_belt,
encoder,
- &frame,
+ frame,
target_size.width,
target_size.height,
);
diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index 750ad62a..d964aed7 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -236,7 +236,7 @@ impl Pipeline {
entries: &[wgpu::BindGroupEntry {
binding: 0,
resource: wgpu::BindingResource::TextureView(
- &texture_atlas.view(),
+ texture_atlas.view(),
),
}],
});
@@ -264,7 +264,7 @@ impl Pipeline {
#[cfg(feature = "image_rs")]
pub fn dimensions(&self, handle: &image::Handle) -> (u32, u32) {
let mut cache = self.raster_cache.borrow_mut();
- let memory = cache.load(&handle);
+ let memory = cache.load(handle);
memory.dimensions()
}
@@ -272,7 +272,7 @@ impl Pipeline {
#[cfg(feature = "svg")]
pub fn viewport_dimensions(&self, handle: &svg::Handle) -> (u32, u32) {
let mut cache = self.vector_cache.borrow_mut();
- let svg = cache.load(&handle);
+ let svg = cache.load(handle);
svg.viewport_dimensions()
}
@@ -358,7 +358,7 @@ impl Pipeline {
entries: &[wgpu::BindGroupEntry {
binding: 0,
resource: wgpu::BindingResource::TextureView(
- &self.texture_atlas.view(),
+ self.texture_atlas.view(),
),
}],
});
diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index c1347e55..a5bfd9c0 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -118,7 +118,7 @@ impl Atlas {
height,
padding,
0,
- &allocation,
+ allocation,
encoder,
);
}
diff --git a/wgpu/src/image/atlas/layer.rs b/wgpu/src/image/atlas/layer.rs
index b1084ed9..cf089601 100644
--- a/wgpu/src/image/atlas/layer.rs
+++ b/wgpu/src/image/atlas/layer.rs
@@ -9,9 +9,6 @@ pub enum Layer {
impl Layer {
pub fn is_empty(&self) -> bool {
- match self {
- Layer::Empty => true,
- _ => false,
- }
+ matches!(self, Layer::Empty)
}
}
diff --git a/wgpu/src/image/raster.rs b/wgpu/src/image/raster.rs
index ec5e911f..bd6c1f45 100644
--- a/wgpu/src/image/raster.rs
+++ b/wgpu/src/image/raster.rs
@@ -59,7 +59,7 @@ impl Cache {
}
}
image::Data::Bytes(bytes) => {
- if let Ok(image) = image_rs::load_from_memory(&bytes) {
+ if let Ok(image) = image_rs::load_from_memory(bytes) {
let operation =
Operation::from_exif(&mut std::io::Cursor::new(bytes))
.ok()
diff --git a/wgpu/src/image/vector.rs b/wgpu/src/image/vector.rs
index 4c830913..b08a0aa2 100644
--- a/wgpu/src/image/vector.rs
+++ b/wgpu/src/image/vector.rs
@@ -60,7 +60,7 @@ impl Cache {
}
svg::Data::Bytes(bytes) => {
match usvg::Tree::from_data(
- &bytes,
+ bytes,
&usvg::Options::default().to_ref(),
) {
Ok(tree) => Svg::Loaded(tree),
@@ -112,7 +112,7 @@ impl Cache {
// It would be cool to be able to smooth resize the `svg` example.
let mut img = tiny_skia::Pixmap::new(width, height)?;
- let _ = resvg::render(
+ resvg::render(
tree,
if width > height {
usvg::FitTo::Width(width)
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 45f1f2de..e17b84c1 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -188,7 +188,8 @@ impl Pipeline {
}
b_count += utf8_len;
}
- return byte_index;
+
+ byte_index
};
if !nearest_only {
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 40e2f855..fd06dddf 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -173,9 +173,7 @@ impl Pipeline {
},
depth_stencil: None,
multisample: wgpu::MultisampleState {
- count: u32::from(
- antialiasing.map(|a| a.sample_count()).unwrap_or(1),
- ),
+ count: antialiasing.map(|a| a.sample_count()).unwrap_or(1),
mask: !0,
alpha_to_coverage_enabled: false,
},
@@ -272,47 +270,43 @@ impl Pipeline {
let vertices = bytemuck::cast_slice(&mesh.buffers.vertices);
let indices = bytemuck::cast_slice(&mesh.buffers.indices);
- match (
+ if let (Some(vertices_size), Some(indices_size)) = (
wgpu::BufferSize::new(vertices.len() as u64),
wgpu::BufferSize::new(indices.len() as u64),
) {
- (Some(vertices_size), Some(indices_size)) => {
- {
- 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();
+ {
+ 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();
}
}
diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs
index 7edeeb94..a3016ff8 100644
--- a/wgpu/src/triangle/msaa.rs
+++ b/wgpu/src/triangle/msaa.rs
@@ -134,7 +134,7 @@ impl Blit {
match &mut self.targets {
None => {
self.targets = Some(Targets::new(
- &device,
+ device,
self.format,
&self.texture_layout,
self.sample_count,
@@ -145,7 +145,7 @@ impl Blit {
Some(targets) => {
if targets.width != width || targets.height != height {
self.targets = Some(Targets::new(
- &device,
+ device,
self.format,
&self.texture_layout,
self.sample_count,
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index fa1f441a..a36d2a87 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -225,7 +225,7 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
renderer.with_primitives(|backend, primitives| {
backend.present(
- &mut self.device,
+ &self.device,
&mut self.staging_belt,
&mut encoder,
view,
generated by cgit (git 2.34.1) at 2025-10-31 23:26:07 +0000