From d6bf8955dbca03898e379aae376d91677bb4d223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Fri, 22 May 2020 19:17:07 +0200
Subject: [PATCH] Use published `glow` and `glow_glyph` versions

---
 glow/Cargo.toml      | 10 ++--------
 glow/src/quad.rs     | 12 ++++++------
 glow/src/triangle.rs |  4 ++--
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/glow/Cargo.toml b/glow/Cargo.toml
index b0d244f0..53952608 100644
--- a/glow/Cargo.toml
+++ b/glow/Cargo.toml
@@ -13,16 +13,14 @@ image = []
 svg = []
 
 [dependencies]
+glow = "0.4"
+glow_glyph = "0.1"
 euclid = "0.20"
 bytemuck = "1.2"
 glam = "0.8"
 log = "0.4"
 glyph_brush = "0.6"
 
-[dependencies.glow]
-git = "https://github.com/grovesNL/glow"
-rev = "722a850e972a69c3012fcb3687758eacbdac2823"
-
 [dependencies.iced_native]
 version = "0.2"
 path = "../native"
@@ -31,7 +29,3 @@ path = "../native"
 version = "0.1"
 path = "../graphics"
 features = ["font-source", "font-fallback", "font-icons", "opengl"]
-
-[dependencies.glow_glyph]
-git = "https://github.com/hecrj/glow_glyph"
-rev = "8ec7982d9e0ce828769d4ba7abe73b0b0ec22db6"
diff --git a/glow/src/quad.rs b/glow/src/quad.rs
index a8fbb9e5..3a65338a 100644
--- a/glow/src/quad.rs
+++ b/glow/src/quad.rs
@@ -48,13 +48,13 @@ impl Pipeline {
 
             let matrix: [f32; 16] = Transformation::identity().into();
             gl.uniform_matrix_4_f32_slice(
-                Some(&transform_location),
+                Some(transform_location),
                 false,
                 &matrix,
             );
 
-            gl.uniform_1_f32(Some(&scale_location), 1.0);
-            gl.uniform_1_f32(Some(&screen_height_location), 0.0);
+            gl.uniform_1_f32(Some(scale_location), 1.0);
+            gl.uniform_1_f32(Some(screen_height_location), 0.0);
 
             gl.use_program(None);
         }
@@ -102,7 +102,7 @@ impl Pipeline {
             unsafe {
                 let matrix: [f32; 16] = transformation.into();
                 gl.uniform_matrix_4_f32_slice(
-                    Some(&self.transform_location),
+                    Some(self.transform_location),
                     false,
                     &matrix,
                 );
@@ -113,7 +113,7 @@ impl Pipeline {
 
         if scale != self.current_scale {
             unsafe {
-                gl.uniform_1_f32(Some(&self.scale_location), scale);
+                gl.uniform_1_f32(Some(self.scale_location), scale);
             }
 
             self.current_scale = scale;
@@ -122,7 +122,7 @@ impl Pipeline {
         if target_height != self.current_target_height {
             unsafe {
                 gl.uniform_1_f32(
-                    Some(&self.screen_height_location),
+                    Some(self.screen_height_location),
                     target_height as f32,
                 );
             }
diff --git a/glow/src/triangle.rs b/glow/src/triangle.rs
index 325359de..ee7faf83 100644
--- a/glow/src/triangle.rs
+++ b/glow/src/triangle.rs
@@ -44,7 +44,7 @@ impl Pipeline {
 
             let transform: [f32; 16] = Transformation::identity().into();
             gl.uniform_matrix_4_f32_slice(
-                Some(&transform_location),
+                Some(transform_location),
                 false,
                 &transform,
             );
@@ -182,7 +182,7 @@ impl Pipeline {
                 if self.current_transform != transform {
                     let matrix: [f32; 16] = transform.into();
                     gl.uniform_matrix_4_f32_slice(
-                        Some(&self.transform_location),
+                        Some(self.transform_location),
                         false,
                         &matrix,
                     );