summaryrefslogtreecommitdiffstats
path: root/wgpu
diff options
context:
space:
mode:
Diffstat (limited to 'wgpu')
-rw-r--r--wgpu/src/color.rs4
-rw-r--r--wgpu/src/image/mod.rs4
-rw-r--r--wgpu/src/quad/gradient.rs4
-rw-r--r--wgpu/src/quad/solid.rs4
-rw-r--r--wgpu/src/text.rs25
-rw-r--r--wgpu/src/triangle.rs22
-rw-r--r--wgpu/src/triangle/msaa.rs4
-rw-r--r--wgpu/src/window/compositor.rs1
8 files changed, 33 insertions, 35 deletions
diff --git a/wgpu/src/color.rs b/wgpu/src/color.rs
index effac8da..0f2c202f 100644
--- a/wgpu/src/color.rs
+++ b/wgpu/src/color.rs
@@ -108,14 +108,14 @@ pub fn convert(
layout: Some(&pipeline_layout),
vertex: wgpu::VertexState {
module: &shader,
- entry_point: "vs_main",
+ entry_point: Some("vs_main"),
buffers: &[],
compilation_options: wgpu::PipelineCompilationOptions::default(
),
},
fragment: Some(wgpu::FragmentState {
module: &shader,
- entry_point: "fs_main",
+ entry_point: Some("fs_main"),
targets: &[Some(wgpu::ColorTargetState {
format,
blend: Some(wgpu::BlendState {
diff --git a/wgpu/src/image/mod.rs b/wgpu/src/image/mod.rs
index cf83c3f2..caac0813 100644
--- a/wgpu/src/image/mod.rs
+++ b/wgpu/src/image/mod.rs
@@ -128,7 +128,7 @@ impl Pipeline {
layout: Some(&layout),
vertex: wgpu::VertexState {
module: &shader,
- entry_point: "vs_main",
+ entry_point: Some("vs_main"),
buffers: &[wgpu::VertexBufferLayout {
array_stride: mem::size_of::<Instance>() as u64,
step_mode: wgpu::VertexStepMode::Instance,
@@ -158,7 +158,7 @@ impl Pipeline {
},
fragment: Some(wgpu::FragmentState {
module: &shader,
- entry_point: "fs_main",
+ entry_point: Some("fs_main"),
targets: &[Some(wgpu::ColorTargetState {
format,
blend: Some(wgpu::BlendState {
diff --git a/wgpu/src/quad/gradient.rs b/wgpu/src/quad/gradient.rs
index 207b0d73..3d4ca4db 100644
--- a/wgpu/src/quad/gradient.rs
+++ b/wgpu/src/quad/gradient.rs
@@ -124,7 +124,7 @@ impl Pipeline {
layout: Some(&layout),
vertex: wgpu::VertexState {
module: &shader,
- entry_point: "gradient_vs_main",
+ entry_point: Some("gradient_vs_main"),
buffers: &[wgpu::VertexBufferLayout {
array_stride: std::mem::size_of::<Gradient>()
as u64,
@@ -157,7 +157,7 @@ impl Pipeline {
},
fragment: Some(wgpu::FragmentState {
module: &shader,
- entry_point: "gradient_fs_main",
+ entry_point: Some("gradient_fs_main"),
targets: &quad::color_target_state(format),
compilation_options:
wgpu::PipelineCompilationOptions::default(),
diff --git a/wgpu/src/quad/solid.rs b/wgpu/src/quad/solid.rs
index 86f118d6..f3e85ce7 100644
--- a/wgpu/src/quad/solid.rs
+++ b/wgpu/src/quad/solid.rs
@@ -89,7 +89,7 @@ impl Pipeline {
layout: Some(&layout),
vertex: wgpu::VertexState {
module: &shader,
- entry_point: "solid_vs_main",
+ entry_point: Some("solid_vs_main"),
buffers: &[wgpu::VertexBufferLayout {
array_stride: std::mem::size_of::<Solid>() as u64,
step_mode: wgpu::VertexStepMode::Instance,
@@ -119,7 +119,7 @@ impl Pipeline {
},
fragment: Some(wgpu::FragmentState {
module: &shader,
- entry_point: "solid_fs_main",
+ entry_point: Some("solid_fs_main"),
targets: &quad::color_target_state(format),
compilation_options:
wgpu::PipelineCompilationOptions::default(),
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index bf7eae18..591bc0b7 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -7,9 +7,8 @@ use crate::graphics::text::{font_system, to_color, Editor, Paragraph};
use rustc_hash::FxHashMap;
use std::collections::hash_map;
-use std::rc::{self, Rc};
use std::sync::atomic::{self, AtomicU64};
-use std::sync::Arc;
+use std::sync::{self, Arc};
pub use crate::graphics::Text;
@@ -37,7 +36,7 @@ pub enum Item {
pub struct Cache {
id: Id,
group: cache::Group,
- text: Rc<[Text]>,
+ text: Arc<[Text]>,
version: usize,
}
@@ -55,7 +54,7 @@ impl Cache {
Some(Self {
id: Id(NEXT_ID.fetch_add(1, atomic::Ordering::Relaxed)),
group,
- text: Rc::from(text),
+ text: Arc::from(text),
version: 0,
})
}
@@ -65,7 +64,7 @@ impl Cache {
return;
}
- self.text = Rc::from(text);
+ self.text = Arc::from(text);
self.version += 1;
}
}
@@ -76,8 +75,8 @@ struct Upload {
transformation: Transformation,
version: usize,
group_version: usize,
- text: rc::Weak<[Text]>,
- _atlas: rc::Weak<()>,
+ text: sync::Weak<[Text]>,
+ _atlas: sync::Weak<()>,
}
#[derive(Default)]
@@ -90,7 +89,7 @@ struct Group {
atlas: glyphon::TextAtlas,
version: usize,
should_trim: bool,
- handle: Rc<()>, // Keeps track of active uploads
+ handle: Arc<()>, // Keeps track of active uploads
}
impl Storage {
@@ -136,7 +135,7 @@ impl Storage {
),
version: 0,
should_trim: false,
- handle: Rc::new(()),
+ handle: Arc::new(()),
}
});
@@ -167,7 +166,7 @@ impl Storage {
group.should_trim =
group.should_trim || upload.version != cache.version;
- upload.text = Rc::downgrade(&cache.text);
+ upload.text = Arc::downgrade(&cache.text);
upload.version = cache.version;
upload.group_version = group.version;
upload.transformation = new_transformation;
@@ -206,8 +205,8 @@ impl Storage {
transformation: new_transformation,
version: 0,
group_version: group.version,
- text: Rc::downgrade(&cache.text),
- _atlas: Rc::downgrade(&group.handle),
+ text: Arc::downgrade(&cache.text),
+ _atlas: Arc::downgrade(&group.handle),
});
group.should_trim = cache.group.is_singleton();
@@ -226,7 +225,7 @@ impl Storage {
.retain(|_id, upload| upload.text.strong_count() > 0);
self.groups.retain(|id, group| {
- let active_uploads = Rc::weak_count(&group.handle);
+ let active_uploads = Arc::weak_count(&group.handle);
if active_uploads == 0 {
log::debug!("Dropping text atlas: {id:?}");
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index fb858c10..ab88be3b 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -8,8 +8,8 @@ use crate::Buffer;
use rustc_hash::FxHashMap;
use std::collections::hash_map;
-use std::rc::{self, Rc};
use std::sync::atomic::{self, AtomicU64};
+use std::sync::{self, Arc};
const INITIAL_INDEX_COUNT: usize = 1_000;
const INITIAL_VERTEX_COUNT: usize = 1_000;
@@ -31,7 +31,7 @@ pub enum Item {
#[derive(Debug, Clone)]
pub struct Cache {
id: Id,
- batch: Rc<[Mesh]>,
+ batch: Arc<[Mesh]>,
version: usize,
}
@@ -48,13 +48,13 @@ impl Cache {
Some(Self {
id: Id(NEXT_ID.fetch_add(1, atomic::Ordering::Relaxed)),
- batch: Rc::from(meshes),
+ batch: Arc::from(meshes),
version: 0,
})
}
pub fn update(&mut self, meshes: Vec<Mesh>) {
- self.batch = Rc::from(meshes);
+ self.batch = Arc::from(meshes);
self.version += 1;
}
}
@@ -64,7 +64,7 @@ struct Upload {
layer: Layer,
transformation: Transformation,
version: usize,
- batch: rc::Weak<[Mesh]>,
+ batch: sync::Weak<[Mesh]>,
}
#[derive(Debug, Default)]
@@ -113,7 +113,7 @@ impl Storage {
new_transformation,
);
- upload.batch = Rc::downgrade(&cache.batch);
+ upload.batch = Arc::downgrade(&cache.batch);
upload.version = cache.version;
upload.transformation = new_transformation;
}
@@ -135,7 +135,7 @@ impl Storage {
layer,
transformation: new_transformation,
version: 0,
- batch: Rc::downgrade(&cache.batch),
+ batch: Arc::downgrade(&cache.batch),
});
log::debug!(
@@ -753,7 +753,7 @@ mod solid {
layout: Some(&layout),
vertex: wgpu::VertexState {
module: &shader,
- entry_point: "solid_vs_main",
+ entry_point: Some("solid_vs_main"),
buffers: &[wgpu::VertexBufferLayout {
array_stride: std::mem::size_of::<
mesh::SolidVertex2D,
@@ -773,7 +773,7 @@ mod solid {
},
fragment: Some(wgpu::FragmentState {
module: &shader,
- entry_point: "solid_fs_main",
+ entry_point: Some("solid_fs_main"),
targets: &[Some(triangle::fragment_target(format))],
compilation_options:
wgpu::PipelineCompilationOptions::default(),
@@ -926,7 +926,7 @@ mod gradient {
layout: Some(&layout),
vertex: wgpu::VertexState {
module: &shader,
- entry_point: "gradient_vs_main",
+ entry_point: Some("gradient_vs_main"),
buffers: &[wgpu::VertexBufferLayout {
array_stride: std::mem::size_of::<
mesh::GradientVertex2D,
@@ -955,7 +955,7 @@ mod gradient {
},
fragment: Some(wgpu::FragmentState {
module: &shader,
- entry_point: "gradient_fs_main",
+ entry_point: Some("gradient_fs_main"),
targets: &[Some(triangle::fragment_target(format))],
compilation_options:
wgpu::PipelineCompilationOptions::default(),
diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs
index ec06e747..0a5b134f 100644
--- a/wgpu/src/triangle/msaa.rs
+++ b/wgpu/src/triangle/msaa.rs
@@ -110,14 +110,14 @@ impl Blit {
layout: Some(&layout),
vertex: wgpu::VertexState {
module: &shader,
- entry_point: "vs_main",
+ entry_point: Some("vs_main"),
buffers: &[],
compilation_options:
wgpu::PipelineCompilationOptions::default(),
},
fragment: Some(wgpu::FragmentState {
module: &shader,
- entry_point: "fs_main",
+ entry_point: Some("fs_main"),
targets: &[Some(wgpu::ColorTargetState {
format,
blend: Some(
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 56f33b50..4fe689cf 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -370,7 +370,6 @@ impl graphics::Compositor for Compositor {
fn screenshot<T: AsRef<str>>(
&mut self,
renderer: &mut Self::Renderer,
- _surface: &mut Self::Surface,
viewport: &Viewport,
background_color: Color,
overlay: &[T],
generated by cgit (git 2.34.1) at 2025-04-25 23:57:31 +0000