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

Fixed issue where quads of different types were not ordered.

Browse source
This commit is contained in:
Bingus 2023-05-25 10:27:27 -07:00
parent 75110b9c0e
commit 3f141459a6
No known key found for this signature in database
GPG key ID: 5F84D2AA40A9F170
4 changed files with 87 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

42
wgpu/src/layer.rs
View file

@ -43,6 +43,12 @@ pub struct Quads {
/// The gradient quads of the [`Layer`].
pub gradients: Vec<quad::Gradient>,
/// The quad order of the [`Layer`]; stored as a tuple of the quad type & its count.
pub order: Vec<(quad::Order, usize)>,
// The last index of quad ordering.
index: usize,
}
impl Quads {
@ -174,12 +180,13 @@ impl<'a> Layer<'a> {
border_width: *border_width,
};
match background {
let quad_order = match background {
Background::Color(color) => {
layer.quads.solids.push(quad::Solid {
color: color.into_linear(),
quad,
});
quad::Order::Solid
}
Background::Gradient(gradient) => {
let quad = quad::Gradient {
@ -194,8 +201,41 @@ impl<'a> Layer<'a> {
};
layer.quads.gradients.push(quad);
quad::Order::Gradient
}
};
match (layer.quads.order.get_mut(layer.quads.index), quad_order)
{
(Some((quad_order, count)), quad::Order::Solid) => {
match quad_order {
quad::Order::Solid => {
*count += 1;
}
quad::Order::Gradient => {
layer.quads.order.push((quad::Order::Solid, 1));
layer.quads.index += 1;
}
}
}
(Some((quad_order, count)), quad::Order::Gradient) => {
match quad_order {
quad::Order::Solid => {
layer
.quads
.order
.push((quad::Order::Gradient, 1));
layer.quads.index += 1;
}
quad::Order::Gradient => {
*count += 1;
}
}
}
(None, _) => {
layer.quads.order.push((quad_order, 1));
}
}
}
Primitive::Image { handle, bounds } => {
let layer = &mut layers[current_layer];