Fix rendering order for `quad::Pipeline`

2 files changed, 15 insertions, 14 deletions

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 2c35936c..395d28d5 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -88,14 +88,13 @@ impl Backend {
         let mut layers = Layer::generate(primitives, viewport);
         layers.push(Layer::overlay(overlay_text, viewport));
 
-        for (i, layer) in layers.iter().enumerate() {
+        for layer in layers {
             self.flush(
                 device,
                 queue,
                 scale_factor,
                 transformation,
                 &layer,
-                i,
                 staging_belt,
                 encoder,
                 frame,
@@ -117,7 +116,6 @@ impl Backend {
         scale_factor: f32,
         transformation: Transformation,
         layer: &Layer<'_>,
-        layer_index: usize,
         staging_belt: &mut wgpu::util::StagingBelt,
         encoder: &mut wgpu::CommandEncoder,
         target: &wgpu::TextureView,
@@ -154,8 +152,7 @@ impl Backend {
                     depth_stencil_attachment: None,
                 });
 
-            self.quad_pipeline
-                .render(layer_index, bounds, &mut render_pass);
+            self.quad_pipeline.render(bounds, &mut render_pass);
         }
 
         if !layer.meshes.is_empty() {
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index ebbe7a9d..e4173b12 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -17,7 +17,8 @@ pub struct Pipeline {
     vertices: wgpu::Buffer,
     indices: wgpu::Buffer,
     layers: Vec<Layer>,
-    current_layer: usize,
+    prepare_layer: usize,
+    render_layer: usize,
 }
 
 impl Pipeline {
@@ -139,7 +140,8 @@ impl Pipeline {
             vertices,
             indices,
             layers: Vec::new(),
-            current_layer: 0,
+            prepare_layer: 0,
+            render_layer: 0,
         }
     }
 
@@ -151,23 +153,22 @@ impl Pipeline {
         transformation: Transformation,
         scale: f32,
     ) {
-        if self.layers.len() <= self.current_layer {
+        if self.layers.len() <= self.prepare_layer {
             self.layers.push(Layer::new(device, &self.constant_layout));
         }
 
-        let layer = &mut self.layers[self.current_layer];
+        let layer = &mut self.layers[self.prepare_layer];
         layer.prepare(device, queue, instances, transformation, scale);
 
-        self.current_layer += 1;
+        self.prepare_layer += 1;
     }
 
     pub fn render<'a>(
-        &'a self,
-        layer: usize,
+        &'a mut self,
         bounds: Rectangle<u32>,
         render_pass: &mut wgpu::RenderPass<'a>,
     ) {
-        if let Some(layer) = self.layers.get(layer) {
+        if let Some(layer) = self.layers.get(self.render_layer) {
             render_pass.set_pipeline(&self.pipeline);
 
             render_pass.set_scissor_rect(
@@ -184,11 +185,14 @@ impl Pipeline {
             render_pass.set_vertex_buffer(0, self.vertices.slice(..));
 
             layer.draw(render_pass);
+
+            self.render_layer += 1;
         }
     }
 
     pub fn end_frame(&mut self) {
-        self.current_layer = 0;
+        self.prepare_layer = 0;
+        self.render_layer = 0;
     }
 }