render: Make Mesh a struct, not just an alias for Vec<Draw>

render/src/tessellator.rs

@@ -195,7 +195,9 @@ impl ShapeTessellator {
         self.flush_draw(DrawType::Color);
 
         self.lyon_mesh = VertexBuffers::new();
-        std::mem::take(&mut self.mesh)
+        Mesh {
+            draws: std::mem::take(&mut self.mesh),
+        }
     }
 
     fn flush_draw(&mut self, draw: DrawType) {
@@ -224,7 +226,9 @@ impl Default for ShapeTessellator {
     }
 }
 
-type Mesh = Vec<Draw>;
+pub struct Mesh {
+    pub draws: Vec<Draw>,
+}
 
 pub struct Draw {
     pub draw_type: DrawType,

render/webgl/src/lib.rs

@@ -574,8 +574,8 @@ impl WebGlRenderBackend {
             .shape_tessellator
             .tessellate_shape(shape, bitmap_source);
 
-        let mut draws = Vec::with_capacity(lyon_mesh.len());
-        for draw in lyon_mesh {
+        let mut draws = Vec::with_capacity(lyon_mesh.draws.len());
+        for draw in lyon_mesh.draws {
             let num_indices = draw.indices.len() as i32;
             let num_mask_indices = draw.mask_index_count as i32;
 

render/wgpu/src/backend.rs

@@ -245,11 +245,11 @@ impl<T: RenderTarget> WgpuRenderBackend<T> {
             .shape_tessellator
             .tessellate_shape(shape, bitmap_source);
 
-        let mut draws = Vec::with_capacity(lyon_mesh.len());
+        let mut draws = Vec::with_capacity(lyon_mesh.draws.len());
         let mut uniform_buffer = BufferBuilder::new_for_uniform(&self.descriptors.limits);
         let mut vertex_buffer = BufferBuilder::new_for_vertices(&self.descriptors.limits);
         let mut index_buffer = BufferBuilder::new_for_vertices(&self.descriptors.limits);
-        for draw in lyon_mesh {
+        for draw in lyon_mesh.draws {
             let draw_id = draws.len();
             if let Some(draw) = PendingDraw::new(
                 self,