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

Use published `glow` version

This commit is contained in:
Héctor Ramón Jiménez 2020-05-22 18:58:31 +02:00
parent 8ec7982d9e
commit 6a00722e84
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.toml
View File

@ -5,14 +5,11 @@ 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"

6
src/pipeline.rs
View File

@ -56,7 +56,7 @@ impl Pipeline {
gl.use_program(Some(program)); gl.use_program(Some(program));
gl.uniform_matrix_4_f32_slice( gl.uniform_matrix_4_f32_slice(
Some(&transform), Some(transform),
false, false,
&IDENTITY_MATRIX, &IDENTITY_MATRIX,
); );
@ -90,7 +90,7 @@ impl Pipeline {
if self.current_transform != transform { if self.current_transform != transform {
unsafe { unsafe {
gl.uniform_matrix_4_f32_slice( gl.uniform_matrix_4_f32_slice(
Some(&self.transform), Some(self.transform),
false, false,
&transform, &transform,
); );
@ -112,7 +112,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(&self.sampler), 0); gl.uniform_1_i32(Some(self.sampler), 0);
gl.bind_vertex_array(Some(self.vertex_array)); gl.bind_vertex_array(Some(self.vertex_array));