diff --git a/Cargo.toml b/Cargo.toml index 300102d..46c085d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ documentation = "https://docs.rs/glow_glyph" readme = "README.md" [dependencies] -glow = "0.5" +glow = "0.6" glyph_brush = "0.7" log = "0.4" bytemuck = "1.4" diff --git a/examples/clipping.rs b/examples/clipping.rs index 0fbe042..26c430b 100644 --- a/examples/clipping.rs +++ b/examples/clipping.rs @@ -22,9 +22,11 @@ fn main() -> Result<(), Box> { let mut size = context.window().inner_size(); // Initialize OpenGL - let gl = glow::Context::from_loader_function(|s| { - context.get_proc_address(s) as *const _ - }); + let gl = unsafe { + glow::Context::from_loader_function(|s| { + context.get_proc_address(s) as *const _ + }) + }; // Prepare glyph_brush let inconsolata = ab_glyph::FontArc::try_from_slice(include_bytes!( @@ -71,7 +73,7 @@ fn main() -> Result<(), Box> { screen_position: (30.0, 30.0), bounds: (size.width as f32, size.height as f32), text: vec![Text::default() - .with_text("Hello wgpu_glyph!") + .with_text("Hello glow_glyph!") .with_color([0.0, 0.0, 0.0, 1.0]) .with_scale(40.0)], ..Section::default() @@ -85,7 +87,7 @@ fn main() -> Result<(), Box> { screen_position: (30.0, 90.0), bounds: (size.width as f32, size.height as f32), text: vec![Text::default() - .with_text("Hello wgpu_glyph!") + .with_text("Hello glow_glyph!") .with_color([1.0, 1.0, 1.0, 1.0]) .with_scale(40.0)], ..Section::default() diff --git a/examples/hello.rs b/examples/hello.rs index 3be4979..cc9eaa9 100644 --- a/examples/hello.rs +++ b/examples/hello.rs @@ -22,9 +22,11 @@ fn main() -> Result<(), Box> { let mut size = context.window().inner_size(); // Initialize OpenGL - let gl = glow::Context::from_loader_function(|s| { - context.get_proc_address(s) as *const _ - }); + let gl = unsafe { + glow::Context::from_loader_function(|s| { + context.get_proc_address(s) as *const _ + }) + }; // Prepare glyph_brush let inconsolata = ab_glyph::FontArc::try_from_slice(include_bytes!( @@ -77,7 +79,7 @@ fn main() -> Result<(), Box> { screen_position: (30.0, 30.0), bounds: (size.width as f32, size.height as f32), text: vec![Text::default() - .with_text("Hello wgpu_glyph!") + .with_text("Hello glow_glyph!") .with_color([0.0, 0.0, 0.0, 1.0]) .with_scale(40.0)], ..Section::default() @@ -87,7 +89,7 @@ fn main() -> Result<(), Box> { screen_position: (30.0, 90.0), bounds: (size.width as f32, size.height as f32), text: vec![Text::default() - .with_text("Hello wgpu_glyph!") + .with_text("Hello glow_glyph!") .with_color([1.0, 1.0, 1.0, 1.0]) .with_scale(40.0)], ..Section::default()