diff options
| author |  Kaiden42 <gitlab@tinysn.com> | 2020-09-09 14:47:36 +0200 |
|---|---|---|
| committer | Kaiden42 <gitlab@tinysn.com> | 2020-09-09 14:47:36 +0200 |
| commit | 0724fb8ebf7c60b396843d021b949cc9061b4c3e (patch) | |
| tree | e538d3b83d399acccf62577f4eebc459d44b5ef8 /glow/src/window | |
| parent | 5bfa4805a944abe82700287f0af0117462d6d21c (diff) | |
| parent | 49076c6ac2983e2076dae64f68a2e801904d7ce9 (diff) | |
| download | iced-0724fb8ebf7c60b396843d021b949cc9061b4c3e.tar.gz iced-0724fb8ebf7c60b396843d021b949cc9061b4c3e.tar.bz2 iced-0724fb8ebf7c60b396843d021b949cc9061b4c3e.zip | |
Merge branch 'master' from upstream into embedded
Diffstat (limited to 'glow/src/window')
| -rw-r--r-- | glow/src/window/compositor.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/glow/src/window/compositor.rs b/glow/src/window/compositor.rs index 3ad10b59..1fb671ad 100644 --- a/glow/src/window/compositor.rs +++ b/glow/src/window/compositor.rs @@ -1,4 +1,4 @@ -use crate::{Backend, Color, Renderer, Settings, Viewport}; +use crate::{Backend, Color, Error, Renderer, Settings, Viewport}; use core::ffi::c_void; use glow::HasContext; @@ -18,7 +18,7 @@ impl iced_graphics::window::GLCompositor for Compositor { unsafe fn new( settings: Self::Settings, loader_function: impl FnMut(&str) -> *const c_void, - ) -> (Self, Self::Renderer) { + ) -> Result<(Self, Self::Renderer), Error> { let gl = glow::Context::from_loader_function(loader_function); // Enable auto-conversion from/to sRGB @@ -33,7 +33,7 @@ impl iced_graphics::window::GLCompositor for Compositor { let renderer = Renderer::new(Backend::new(&gl, settings)); - (Self { gl }, renderer) + Ok((Self { gl }, renderer)) } fn sample_count(settings: &Settings) -> u32 { |