me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename quad::Order to quad::Kind

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-05-30 00:59:42 +02:00
parent fe9da174ca
commit 6d650e7f99
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
wgpu/src/quad.rs
View file

@ -115,7 +115,7 @@ impl Pipeline {
for (quad_order, count) in &quads.order { for (quad_order, count) in &quads.order {
match quad_order { match quad_order {
Order::Solid => { Kind::Solid => {
render_pass.set_pipeline(&self.solid.pipeline); render_pass.set_pipeline(&self.solid.pipeline);
layer.solid.draw( layer.solid.draw(
&layer.constants, &layer.constants,
@ -124,7 +124,7 @@ impl Pipeline {
); );
solid_offset += count; solid_offset += count;
} }
Order::Gradient => { Kind::Gradient => {
render_pass.set_pipeline(&self.gradient.pipeline); render_pass.set_pipeline(&self.gradient.pipeline);
layer.gradient.draw( layer.gradient.draw(
&layer.constants, &layer.constants,
@ -243,7 +243,7 @@ pub struct Batch {
gradients: Vec<Gradient>, gradients: Vec<Gradient>,
/// The quad order of the [`Layer`]; stored as a tuple of the quad type & its count. /// The quad order of the [`Layer`]; stored as a tuple of the quad type & its count.
order: Vec<(Order, usize)>, order: Vec<(Kind, usize)>,
/// The last index of quad ordering. /// The last index of quad ordering.
index: usize, index: usize,
@ -264,7 +264,7 @@ impl Batch {
quad, quad,
}); });
Order::Solid Kind::Solid
} }
Background::Gradient(gradient) => { Background::Gradient(gradient) => {
let quad = Gradient { let quad = Gradient {
@ -276,26 +276,26 @@ impl Batch {
}; };
self.gradients.push(quad); self.gradients.push(quad);
Order::Gradient Kind::Gradient
} }
}; };
match (self.order.get_mut(self.index), quad_order) { match (self.order.get_mut(self.index), quad_order) {
(Some((quad_order, count)), Order::Solid) => match quad_order { (Some((quad_order, count)), Kind::Solid) => match quad_order {
Order::Solid => { Kind::Solid => {
*count += 1; *count += 1;
} }
Order::Gradient => { Kind::Gradient => {
self.order.push((Order::Solid, 1)); self.order.push((Kind::Solid, 1));
self.index += 1; self.index += 1;
} }
}, },
(Some((quad_order, count)), Order::Gradient) => match quad_order { (Some((quad_order, count)), Kind::Gradient) => match quad_order {
Order::Solid => { Kind::Solid => {
self.order.push((Order::Gradient, 1)); self.order.push((Kind::Gradient, 1));
self.index += 1; self.index += 1;
} }
Order::Gradient => { Kind::Gradient => {
*count += 1; *count += 1;
} }
}, },
@ -307,8 +307,8 @@ impl Batch {
} }
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]
/// The identifier of a quad, used for ordering. /// The kind of a quad.
enum Order { enum Kind {
/// A solid quad /// A solid quad
Solid, Solid,
/// A gradient quad /// A gradient quad