From 1bcfc9a5cce0b30c3ad9983e407c06e237b491f3 Mon Sep 17 00:00:00 2001
From: Malte Veerman <malte.veerman@gmail.com>
Date: Fri, 10 Jan 2020 14:39:29 +0100
Subject: Implemented a texture atlas for images and svgs.

---
 wgpu/Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'wgpu/Cargo.toml')

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 887c2d21..56839cf0 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -21,6 +21,7 @@ raw-window-handle = "0.3"
 glam = "0.8"
 font-kit = "0.4"
 log = "0.4"
+guillotiere = "0.4"
 
 [dependencies.image]
 version = "0.22"
-- 
cgit 


From 743637ebda8c3e4ba30f41e755ee1079ee66a86c Mon Sep 17 00:00:00 2001
From: Malte Veerman <malte.veerman@gmail.com>
Date: Fri, 10 Jan 2020 16:07:09 +0100
Subject: Merged image and svg texture atlases into one owned by the image
 pipeline.

---
 wgpu/Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'wgpu/Cargo.toml')

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 56839cf0..f8b5bb8c 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -22,6 +22,7 @@ glam = "0.8"
 font-kit = "0.4"
 log = "0.4"
 guillotiere = "0.4"
+debug_stub_derive = "0.3"
 
 [dependencies.image]
 version = "0.22"
-- 
cgit 


From 2f695ef9803c9c08f64961f1b9902a661a385160 Mon Sep 17 00:00:00 2001
From: Malte Veerman <malte.veerman@gmail.com>
Date: Fri, 17 Jan 2020 20:48:49 +0100
Subject: Updated shaders and removed debug_stub_derive dependency

---
 wgpu/Cargo.toml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'wgpu/Cargo.toml')

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index f8b5bb8c..56839cf0 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -22,7 +22,6 @@ glam = "0.8"
 font-kit = "0.4"
 log = "0.4"
 guillotiere = "0.4"
-debug_stub_derive = "0.3"
 
 [dependencies.image]
 version = "0.22"
-- 
cgit 


From 02091267bf38d4da5efab57e9b63504804b3a468 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 3 Mar 2020 00:06:40 +0100
Subject: Use new `wgpu_glyph` release in `iced_wgpu`

---
 wgpu/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wgpu/Cargo.toml')

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 56839cf0..6c75af7b 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -15,8 +15,8 @@ canvas = ["lyon"]
 iced_native = { version = "0.1.0", path = "../native" }
 iced_style = { version = "0.1.0-alpha", path = "../style" }
 wgpu = "0.4"
+wgpu_glyph = "0.7"
 glyph_brush = "0.6"
-wgpu_glyph = { version = "0.7", git = "https://github.com/hecrj/wgpu_glyph", branch = "fix/font-load-panic" }
 raw-window-handle = "0.3"
 glam = "0.8"
 font-kit = "0.4"
-- 
cgit