reivilibre
/
glow_glyph_compat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to latest `glow`

This commit is contained in:
Héctor Ramón Jiménez 2020-05-21 19:51:07 +02:00
parent 8cbf7238f8
commit f027ffa499
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.toml
View File

@ -5,11 +5,14 @@ authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
glow = "0.4"
glyph_brush = "0.6" glyph_brush = "0.6"
log = "0.4" log = "0.4"
bytemuck = "1.2" bytemuck = "1.2"
[dependencies.glow]
git = "https://github.com/grovesNL/glow"
rev = "722a850e972a69c3012fcb3687758eacbdac2823"
[dev-dependencies] [dev-dependencies]
glutin = "0.24" glutin = "0.24"
env_logger = "0.7" env_logger = "0.7"

4
src/pipeline.rs
View File

@ -63,7 +63,7 @@ impl Pipeline {
if self.current_transform != transform { if self.current_transform != transform {
unsafe { 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; self.current_transform = transform;
@ -82,7 +82,7 @@ impl Pipeline {
gl.active_texture(glow::TEXTURE0); gl.active_texture(glow::TEXTURE0);
gl.bind_texture(glow::TEXTURE_2D, Some(self.cache.texture)); 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)); gl.bind_vertex_array(Some(self.vertex_array));