From 84d1b79fefc88534835fdfbe79bc0eb3b43627cf Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 3 Nov 2022 05:50:53 +0100
Subject: Move `mesh::Style` to `triangle` and reuse it in `fill` and `stroke`

---
 wgpu/src/triangle.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'wgpu/src/triangle.rs')

diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 6e64e189..765f7d30 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -3,7 +3,8 @@ use crate::{settings, Transformation};
 use core::fmt;
 use std::fmt::Formatter;
 
-use iced_graphics::layer::{mesh, Mesh};
+use iced_graphics::layer::mesh::{self, Mesh};
+use iced_graphics::triangle;
 use iced_graphics::Size;
 
 use crate::buffer::r#static::Buffer;
@@ -141,10 +142,10 @@ impl Pipeline {
 
             //push uniform data to CPU buffers
             match mesh.style {
-                mesh::Style::Solid(color) => {
+                triangle::Style::Solid(color) => {
                     self.pipelines.solid.push(transform, color);
                 }
-                mesh::Style::Gradient(gradient) => {
+                triangle::Style::Gradient(gradient) => {
                     self.pipelines.gradient.push(transform, gradient);
                 }
             }
@@ -199,7 +200,7 @@ impl Pipeline {
                 );
 
                 match mesh.style {
-                    mesh::Style::Solid(_) => {
+                    triangle::Style::Solid(_) => {
                         if !last_is_solid.unwrap_or(false) {
                             self.pipelines
                                 .solid
@@ -215,7 +216,7 @@ impl Pipeline {
 
                         num_solids += 1;
                     }
-                    mesh::Style::Gradient(_) => {
+                    triangle::Style::Gradient(_) => {
                         if last_is_solid.unwrap_or(true) {
                             self.pipelines
                                 .gradient
-- 
cgit