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

Update to glow 0.5

This commit is contained in:
Dario Nieuwenhuis 2020-07-27 01:44:59 +02:00
parent 225089efbf
commit d52923f76d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -11,7 +11,7 @@ documentation = "https://docs.rs/glow_glyph"
readme = "README.md" readme = "README.md"
[dependencies] [dependencies]
glow = "0.4" glow = "0.5"
glyph_brush = "0.7" glyph_brush = "0.7"
log = "0.4" log = "0.4"
bytemuck = "1.2" bytemuck = "1.2"

6
src/pipeline.rs
View File

@ -54,10 +54,10 @@ impl Pipeline {
unsafe { unsafe {
gl.use_program(Some(program)); gl.use_program(Some(program));
gl.uniform_1_i32(Some(sampler), 0); gl.uniform_1_i32(Some(&sampler), 0);
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,
); );

4
src/pipeline/cache.rs
View File

@ -66,7 +66,7 @@ impl Cache {
gl.bind_texture(glow::TEXTURE_2D, Some(self.texture)); gl.bind_texture(glow::TEXTURE_2D, Some(self.texture));
gl.tex_sub_image_2d_u8_slice( gl.tex_sub_image_2d(
glow::TEXTURE_2D, glow::TEXTURE_2D,
0, 0,
i32::from(offset_x), i32::from(offset_x),
@ -75,7 +75,7 @@ impl Cache {
i32::from(height), i32::from(height),
glow::RED, glow::RED,
glow::UNSIGNED_BYTE, glow::UNSIGNED_BYTE,
Some(data), glow::PixelUnpackData::Slice(data),
); );
gl.bind_texture(glow::TEXTURE_2D, None); gl.bind_texture(glow::TEXTURE_2D, None);