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

Merge branch 'master' into feature/canvas-interaction

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-04-29 07:34:14 +02:00
commit 61c707fe04
18 changed files with 147 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

24
wgpu/src/renderer.rs
View file

@ -355,6 +355,18 @@ impl Renderer {
) {
let bounds = layer.bounds * scale_factor;
if !layer.quads.is_empty() {
self.quad_pipeline.draw(
device,
encoder,
&layer.quads,
transformation,
scale_factor,
bounds,
target,
);
}
if !layer.meshes.is_empty() {
let scaled = transformation
* Transformation::scale(scale_factor, scale_factor);
@ -371,18 +383,6 @@ impl Renderer {
);
}
if !layer.quads.is_empty() {
self.quad_pipeline.draw(
device,
encoder,
&layer.quads,
transformation,
scale_factor,
bounds,
target,
);
}
#[cfg(any(feature = "image", feature = "svg"))]
{
if !layer.images.is_empty() {