From 6a00722e84f5ca1108facde7d02e0d2e132fcec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Fri, 22 May 2020 18:58:31 +0200 Subject: [PATCH] Use published `glow` version --- Cargo.toml | 5 +---- src/pipeline.rs | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2abd03f..faf5b54 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,14 +5,11 @@ authors = ["Héctor Ramón Jiménez "] edition = "2018" [dependencies] +glow = "0.4" glyph_brush = "0.6" log = "0.4" bytemuck = "1.2" -[dependencies.glow] -git = "https://github.com/grovesNL/glow" -rev = "722a850e972a69c3012fcb3687758eacbdac2823" - [dev-dependencies] glutin = "0.24" env_logger = "0.7" diff --git a/src/pipeline.rs b/src/pipeline.rs index 397d05e..d3c407f 100644 --- a/src/pipeline.rs +++ b/src/pipeline.rs @@ -56,7 +56,7 @@ impl Pipeline { gl.use_program(Some(program)); gl.uniform_matrix_4_f32_slice( - Some(&transform), + Some(transform), false, &IDENTITY_MATRIX, ); @@ -90,7 +90,7 @@ impl Pipeline { if self.current_transform != transform { unsafe { gl.uniform_matrix_4_f32_slice( - Some(&self.transform), + Some(self.transform), false, &transform, ); @@ -112,7 +112,7 @@ impl Pipeline { gl.active_texture(glow::TEXTURE0); gl.bind_texture(glow::TEXTURE_2D, Some(self.cache.texture)); - gl.uniform_1_i32(Some(&self.sampler), 0); + gl.uniform_1_i32(Some(self.sampler), 0); gl.bind_vertex_array(Some(self.vertex_array));