From 1e62fdf069db5687be510e1cc375260bbff318a7 Mon Sep 17 00:00:00 2001 From: Richard Date: Thu, 27 Jan 2022 04:00:53 -0300 Subject: Introduce `Error::ContextCreationFailed` --- glutin/src/application.rs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'glutin/src') diff --git a/glutin/src/application.rs b/glutin/src/application.rs index 27a932fc..146b234e 100644 --- a/glutin/src/application.rs +++ b/glutin/src/application.rs @@ -80,12 +80,25 @@ where .or_else(|_| second_builder.build_windowed(builder, &event_loop)) .map_err(|error| { use glutin::CreationError; + use iced_graphics::Error as ContextError; match error { CreationError::Window(error) => { Error::WindowCreationFailed(error) } - _ => Error::GraphicsAdapterNotFound, + CreationError::OpenGlVersionNotSupported => { + Error::ContextCreationFailed( + ContextError::VersionNotSupported, + ) + } + CreationError::NoAvailablePixelFormat => { + Error::ContextCreationFailed( + ContextError::NoAvailablePixelFormat, + ) + } + error => Error::ContextCreationFailed( + ContextError::BackendError(error.to_string()), + ), } })?; -- cgit From 764b424dfc2b2163f21483a6d1f05ea1da62c561 Mon Sep 17 00:00:00 2001 From: Richard Date: Thu, 27 Jan 2022 06:02:19 -0300 Subject: Add logging to window and context creation --- glutin/src/application.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'glutin/src') diff --git a/glutin/src/application.rs b/glutin/src/application.rs index 146b234e..148a8e50 100644 --- a/glutin/src/application.rs +++ b/glutin/src/application.rs @@ -61,6 +61,8 @@ where settings.id, ); + log::info!("Window builder: {:#?}", builder); + let opengl_builder = ContextBuilder::new() .with_vsync(true) .with_multisampling(C::sample_count(&compositor_settings) as u16); @@ -75,9 +77,14 @@ where (opengl_builder, opengles_builder) }; + log::info!("Trying first builder: {:#?}", first_builder); + let context = first_builder .build_windowed(builder.clone(), &event_loop) - .or_else(|_| second_builder.build_windowed(builder, &event_loop)) + .or_else(|_| { + log::info!("Trying second builder: {:#?}", second_builder); + second_builder.build_windowed(builder, &event_loop) + }) .map_err(|error| { use glutin::CreationError; use iced_graphics::Error as ContextError; -- cgit From ced5f5075f0debe7fee0b86b064c64f46055a000 Mon Sep 17 00:00:00 2001 From: Richard Date: Thu, 17 Mar 2022 00:22:27 -0300 Subject: Export `system` module in `iced_glutin` --- glutin/src/lib.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'glutin/src') diff --git a/glutin/src/lib.rs b/glutin/src/lib.rs index 72397791..99486034 100644 --- a/glutin/src/lib.rs +++ b/glutin/src/lib.rs @@ -22,6 +22,7 @@ pub mod application; pub use iced_winit::clipboard; pub use iced_winit::conversion; pub use iced_winit::settings; +pub use iced_winit::system; pub use iced_winit::window; pub use iced_winit::{Error, Mode}; -- cgit From 75281d2b8574ffdab6573bd37b8ac501b59f046d Mon Sep 17 00:00:00 2001 From: Richard Date: Thu, 17 Mar 2022 00:59:50 -0300 Subject: Add graphics information to `iced_glutin` --- glutin/src/application.rs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'glutin/src') diff --git a/glutin/src/application.rs b/glutin/src/application.rs index 148a8e50..5e29ddc8 100644 --- a/glutin/src/application.rs +++ b/glutin/src/application.rs @@ -130,6 +130,7 @@ where &mut clipboard, &mut proxy, context.window(), + &compositor.get_information(), ); runtime.track(subscription); @@ -208,6 +209,7 @@ async fn run_instance( let mut state = application::State::new(&application, context.window()); let mut viewport_version = state.viewport_version(); + let graphics_info = compositor.get_information(); let mut user_interface = ManuallyDrop::new(application::build_user_interface( &mut application, @@ -264,6 +266,7 @@ async fn run_instance( &mut debug, &mut messages, context.window(), + &graphics_info, ); // Update window -- cgit From 005e516b5e1e8bb22f2da8524ffe4529f3b60ba1 Mon Sep 17 00:00:00 2001 From: Richard Date: Tue, 26 Apr 2022 19:20:38 -0300 Subject: Rename `get_information` to `fetch_information` --- glutin/src/application.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'glutin/src') diff --git a/glutin/src/application.rs b/glutin/src/application.rs index 5e29ddc8..1400dcce 100644 --- a/glutin/src/application.rs +++ b/glutin/src/application.rs @@ -130,7 +130,7 @@ where &mut clipboard, &mut proxy, context.window(), - &compositor.get_information(), + &compositor.fetch_information(), ); runtime.track(subscription); @@ -209,7 +209,7 @@ async fn run_instance( let mut state = application::State::new(&application, context.window()); let mut viewport_version = state.viewport_version(); - let graphics_info = compositor.get_information(); + let graphics_info = compositor.fetch_information(); let mut user_interface = ManuallyDrop::new(application::build_user_interface( &mut application, -- cgit From 18ecec2bbd9478151b8c65df0644278a174d0847 Mon Sep 17 00:00:00 2001 From: Richard Date: Tue, 26 Apr 2022 19:28:04 -0300 Subject: Change `ContextCreationFailed` to `GraphicsCreationFailed` --- glutin/src/application.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'glutin/src') diff --git a/glutin/src/application.rs b/glutin/src/application.rs index 1400dcce..61f3ecd5 100644 --- a/glutin/src/application.rs +++ b/glutin/src/application.rs @@ -94,16 +94,16 @@ where Error::WindowCreationFailed(error) } CreationError::OpenGlVersionNotSupported => { - Error::ContextCreationFailed( + Error::GraphicsCreationFailed( ContextError::VersionNotSupported, ) } CreationError::NoAvailablePixelFormat => { - Error::ContextCreationFailed( + Error::GraphicsCreationFailed( ContextError::NoAvailablePixelFormat, ) } - error => Error::ContextCreationFailed( + error => Error::GraphicsCreationFailed( ContextError::BackendError(error.to_string()), ), } -- cgit From 6e167675d6a51a8a78d93439719ebffe35dcfdef Mon Sep 17 00:00:00 2001 From: Richard Date: Wed, 27 Apr 2022 15:40:29 -0300 Subject: Use closure internally to fetch `graphics_info` --- glutin/src/application.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'glutin/src') diff --git a/glutin/src/application.rs b/glutin/src/application.rs index 61f3ecd5..dbc9b580 100644 --- a/glutin/src/application.rs +++ b/glutin/src/application.rs @@ -130,7 +130,7 @@ where &mut clipboard, &mut proxy, context.window(), - &compositor.fetch_information(), + || compositor.fetch_information(), ); runtime.track(subscription); @@ -209,7 +209,6 @@ async fn run_instance( let mut state = application::State::new(&application, context.window()); let mut viewport_version = state.viewport_version(); - let graphics_info = compositor.fetch_information(); let mut user_interface = ManuallyDrop::new(application::build_user_interface( &mut application, @@ -266,7 +265,7 @@ async fn run_instance( &mut debug, &mut messages, context.window(), - &graphics_info, + || compositor.fetch_information(), ); // Update window -- cgit From 93bfe2c75ec97ef78f993926c703f040dde4a5f3 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 30 Apr 2022 13:37:57 +0200 Subject: Expose `system` module through feature flag --- glutin/src/lib.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'glutin/src') diff --git a/glutin/src/lib.rs b/glutin/src/lib.rs index 99486034..fb24b688 100644 --- a/glutin/src/lib.rs +++ b/glutin/src/lib.rs @@ -22,7 +22,6 @@ pub mod application; pub use iced_winit::clipboard; pub use iced_winit::conversion; pub use iced_winit::settings; -pub use iced_winit::system; pub use iced_winit::window; pub use iced_winit::{Error, Mode}; @@ -32,3 +31,6 @@ pub use application::Application; pub use clipboard::Clipboard; #[doc(no_inline)] pub use settings::Settings; + +#[cfg(feature = "system")] +pub use iced_winit::system; -- cgit From 3e735f14803a3c7e4b37e48e684e584393ad9e91 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 4 May 2022 17:15:13 +0200 Subject: Re-export `iced_winit` in `iced_glutin` This fixes the `system` module not being exported in `iced_glutin` when only setting the `iced_winit/system` flag. --- glutin/src/lib.rs | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'glutin/src') diff --git a/glutin/src/lib.rs b/glutin/src/lib.rs index fb24b688..146dfc4d 100644 --- a/glutin/src/lib.rs +++ b/glutin/src/lib.rs @@ -14,23 +14,11 @@ #![forbid(rust_2018_idioms)] pub use glutin; + #[doc(no_inline)] -pub use iced_native::*; +pub use iced_winit::*; pub mod application; -pub use iced_winit::clipboard; -pub use iced_winit::conversion; -pub use iced_winit::settings; -pub use iced_winit::window; -pub use iced_winit::{Error, Mode}; - #[doc(no_inline)] pub use application::Application; -#[doc(no_inline)] -pub use clipboard::Clipboard; -#[doc(no_inline)] -pub use settings::Settings; - -#[cfg(feature = "system")] -pub use iced_winit::system; -- cgit