From f027ffa49962d78ac85e282c635e848bef785ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Thu, 21 May 2020 19:51:07 +0200 Subject: [PATCH] Update to latest `glow` --- Cargo.toml | 5 ++++- src/pipeline.rs | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index faf5b54..2abd03f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,11 +5,14 @@ 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 fc235a2..2130bf5 100644 --- a/src/pipeline.rs +++ b/src/pipeline.rs @@ -63,7 +63,7 @@ impl Pipeline { if self.current_transform != transform { unsafe { - gl.uniform_matrix_4_f32_slice(Some(0), false, &transform); + gl.uniform_matrix_4_f32_slice(Some(&0), false, &transform); } self.current_transform = transform; @@ -82,7 +82,7 @@ impl Pipeline { gl.active_texture(glow::TEXTURE0); gl.bind_texture(glow::TEXTURE_2D, Some(self.cache.texture)); - gl.uniform_1_i32(Some(1), 0); + gl.uniform_1_i32(Some(&1), 0); gl.bind_vertex_array(Some(self.vertex_array));