diff options
| author |  Héctor Ramón Jiménez <hector@hecrj.dev> | 2024-04-07 14:01:05 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector@hecrj.dev> | 2024-04-07 14:06:52 +0200 |
| commit | 13289dbd1933e7d7a0b21cffd197813f8f6f7fc0 (patch) | |
| tree | 85cbda9aa86c277e623943307c63a33e192ae609 /wgpu/src | |
| parent | 5e01d767c5ef8a35937675d4e8f02b4c678a5da2 (diff) | |
| parent | 1c241d1150d2f7b5d0ae154439325950e5d25f38 (diff) | |
| download | iced-13289dbd1933e7d7a0b21cffd197813f8f6f7fc0.tar.gz iced-13289dbd1933e7d7a0b21cffd197813f8f6f7fc0.tar.bz2 iced-13289dbd1933e7d7a0b21cffd197813f8f6f7fc0.zip | |
Merge branch 'master' into wgpu/better-architecture
Diffstat (limited to 'wgpu/src')
| -rw-r--r-- | wgpu/src/geometry.rs | 3 | ||||
| -rw-r--r-- | wgpu/src/image/null.rs | 2 | ||||
| -rw-r--r-- | wgpu/src/layer.rs | 2 | ||||
| -rw-r--r-- | wgpu/src/lib.rs | 9 | ||||
| -rw-r--r-- | wgpu/src/triangle.rs | 1 |
5 files changed, 7 insertions, 10 deletions
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs index c36ff38e..985650e2 100644 --- a/wgpu/src/geometry.rs +++ b/wgpu/src/geometry.rs @@ -31,12 +31,13 @@ pub struct Frame { stroke_tessellator: tessellation::StrokeTessellator, } +#[derive(Debug)] pub enum Geometry { Live { meshes: Vec<Mesh>, text: Vec<Text> }, Cached(Cache), } -#[derive(Clone)] +#[derive(Debug, Clone)] pub struct Cache { pub meshes: Option<triangle::Cache>, pub text: Option<text::Cache>, diff --git a/wgpu/src/image/null.rs b/wgpu/src/image/null.rs index 900841a6..c06d56be 100644 --- a/wgpu/src/image/null.rs +++ b/wgpu/src/image/null.rs @@ -1,6 +1,6 @@ pub use crate::graphics::Image; -#[derive(Default)] +#[derive(Debug, Default)] pub struct Batch; impl Batch { diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs index 4c864cb0..c8c27c61 100644 --- a/wgpu/src/layer.rs +++ b/wgpu/src/layer.rs @@ -8,6 +8,7 @@ use crate::quad::{self, Quad}; use crate::text::{self, Text}; use crate::triangle; +#[derive(Debug)] pub struct Layer { pub bounds: Rectangle, pub quads: quad::Batch, @@ -28,6 +29,7 @@ impl Default for Layer { } } +#[derive(Debug)] pub struct Stack { layers: Vec<Layer>, transformations: Vec<Transformation>, diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs index dfc1aad4..ccad08d5 100644 --- a/wgpu/src/lib.rs +++ b/wgpu/src/lib.rs @@ -20,15 +20,8 @@ #![doc( html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg" )] -#![forbid(rust_2018_idioms)] -#![deny( - // missing_debug_implementations, - //missing_docs, - unsafe_code, - unused_results, - rustdoc::broken_intra_doc_links -)] #![cfg_attr(docsrs, feature(doc_auto_cfg))] +#![allow(missing_docs)] pub mod layer; pub mod primitive; pub mod settings; diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs index de6c026a..06c0ef02 100644 --- a/wgpu/src/triangle.rs +++ b/wgpu/src/triangle.rs @@ -16,6 +16,7 @@ const INITIAL_VERTEX_COUNT: usize = 1_000; pub type Batch = Vec<Item>; +#[derive(Debug)] pub enum Item { Group { transformation: Transformation, |