Merge pull request #2 from Dirbaio/glow05

Update to glow 0.5

CHANGELOG.md

@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- `glow` updated to `0.5`. [#2]
+
+[#2]: https://github.com/hecrj/glow_glyph/pull/2
+
 
 ## [0.2.1] - 2020-06-27
 ### Fixed

Cargo.toml

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

src/pipeline.rs

@@ -54,10 +54,10 @@ impl Pipeline {
         unsafe {
             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(
-                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,
                 );

src/pipeline/cache.rs

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