migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 14:50:03 -04:00
Code Activity

Refactor glow setup a bit

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-07 18:51:25 +01:00
parent 25fd7ba2be
commit 35a799c6a1
1 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
crates/eframe/src/native/run.rs
View File

@@ -538,8 +538,7 @@ mod glow_integration {
} }
impl GlutinWindowContext { impl GlutinWindowContext {
/// There is a lot of complexity with opengl creation, so prefer extensive logging to get all the help we can to debug issues. /// Also calls `on_resume` on self.
///
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn new( unsafe fn new(
window_builder: ViewportBuilder, window_builder: ViewportBuilder,
@@ -548,6 +547,9 @@ mod glow_integration {
) -> Result<Self> { ) -> Result<Self> {
crate::profile_function!(); crate::profile_function!();
// There is a lot of complexity with opengl creation,
// so prefer extensive logging to get all the help we can to debug issues.
use glutin::prelude::*; use glutin::prelude::*;
// convert native options to glutin options // convert native options to glutin options
let hardware_acceleration = match native_options.hardware_acceleration { let hardware_acceleration = match native_options.hardware_acceleration {
@@ -663,8 +665,8 @@ mod glow_integration {
window_maps.insert(ViewportId::ROOT, window.id()); window_maps.insert(ViewportId::ROOT, window.id());
} }
let mut windows = ViewportIdMap::default(); let mut viewports = ViewportIdMap::default();
windows.insert( viewports.insert(
ViewportId::ROOT, ViewportId::ROOT,
Rc::new(RefCell::new(Viewport { Rc::new(RefCell::new(Viewport {
gl_surface: None, gl_surface: None,
@@ -682,18 +684,23 @@ mod glow_integration {
// it could keep working until we try to make surface current or swap buffers or something else. future glutin improvements might // it could keep working until we try to make surface current or swap buffers or something else. future glutin improvements might
// help us start from scratch again if we fail context creation and go back to preferEgl or try with different config etc.. // help us start from scratch again if we fail context creation and go back to preferEgl or try with different config etc..
// https://github.com/emilk/egui/pull/2541#issuecomment-1370767582 // https://github.com/emilk/egui/pull/2541#issuecomment-1370767582
Ok(GlutinWindowContext {
let mut slf = GlutinWindowContext {
swap_interval, swap_interval,
gl_config, gl_config,
current_gl_context: None, current_gl_context: None,
not_current_gl_context, not_current_gl_context,
viewports: windows, viewports,
builders, builders,
viewport_maps, viewport_maps,
// This is initialize in init_run_state // This is initialize in init_run_state
max_texture_side: 0, max_texture_side: 0,
window_maps, window_maps,
}) };
slf.on_resume(event_loop)?;
Ok(slf)
} }
/// This will be run after `new`. on android, it might be called multiple times over the course of the app's lifetime. /// This will be run after `new`. on android, it might be called multiple times over the course of the app's lifetime.
@@ -707,30 +714,29 @@ mod glow_integration {
fn on_resume(&mut self, event_loop: &EventLoopWindowTarget<UserEvent>) -> Result<()> { fn on_resume(&mut self, event_loop: &EventLoopWindowTarget<UserEvent>) -> Result<()> {
crate::profile_function!(); crate::profile_function!();
let windows = self let viewports = self
.viewports .viewports
.values() .values()
.cloned() .cloned()
.collect::<Vec<Rc<RefCell<Viewport>>>>(); .collect::<Vec<Rc<RefCell<Viewport>>>>();
for window in windows { for viewport in viewports {
if window.borrow().gl_surface.is_some() { if viewport.borrow().gl_surface.is_none() {
continue; self.init_viewport(&viewport, event_loop)?;
} }
self.init_window(&window, event_loop)?;
} }
Ok(()) Ok(())
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]
pub(crate) fn init_window( pub(crate) fn init_viewport(
&mut self, &mut self,
win: &Rc<RefCell<Viewport>>, viewport: &Rc<RefCell<Viewport>>,
event_loop: &EventLoopWindowTarget<UserEvent>, event_loop: &EventLoopWindowTarget<UserEvent>,
) -> Result<()> { ) -> Result<()> {
let builder = &self.builders[&win.borrow().id_pair.this]; let builder = &self.builders[&viewport.borrow().id_pair.this];
let mut win = win.borrow_mut(); let mut viewport = viewport.borrow_mut();
// make sure we have a window or create one. // make sure we have a window or create one.
let window = win.window.take().unwrap_or_else(|| { let window = viewport.window.take().unwrap_or_else(|| {
log::debug!("window doesn't exist yet. creating one now with finalize_window"); log::debug!("window doesn't exist yet. creating one now with finalize_window");
Rc::new(RefCell::new( Rc::new(RefCell::new(
glutin_winit::finalize_window( glutin_winit::finalize_window(
@@ -784,22 +790,21 @@ mod glow_integration {
// we will reach this point only once in most platforms except android. // we will reach this point only once in most platforms except android.
// create window/surface/make context current once and just use them forever. // create window/surface/make context current once and just use them forever.
let native_pixels_per_point = window.scale_factor() as f32; if viewport.egui_winit.is_none() {
viewport.egui_winit = Some(egui_winit::State::new(
if win.egui_winit.is_none() {
win.egui_winit = Some(egui_winit::State::new(
event_loop, event_loop,
Some(native_pixels_per_point), Some(window.scale_factor() as f32),
Some(self.max_texture_side), Some(self.max_texture_side),
)); ));
} }
win.gl_surface = Some(gl_surface); viewport.gl_surface = Some(gl_surface);
self.current_gl_context = Some(current_gl_context); self.current_gl_context = Some(current_gl_context);
self.viewport_maps.insert(window.id(), win.id_pair.this); self.viewport_maps
self.window_maps.insert(win.id_pair.this, window.id()); .insert(window.id(), viewport.id_pair.this);
self.window_maps.insert(viewport.id_pair.this, window.id());
} }
win.window = Some(window); viewport.window = Some(window);
Ok(()) Ok(())
} }
@@ -900,17 +905,16 @@ mod glow_integration {
storage: Option<&dyn epi::Storage>, storage: Option<&dyn epi::Storage>,
title: &str, title: &str,
native_options: &mut NativeOptions, native_options: &mut NativeOptions,
) -> Result<(GlutinWindowContext, glow::Context)> { ) -> Result<(GlutinWindowContext, egui_glow::Painter)> {
crate::profile_function!(); crate::profile_function!();
let window_settings = epi_integration::load_window_settings(storage); let window_settings = epi_integration::load_window_settings(storage);
let winit_window_builder = let winit_window_builder =
epi_integration::window_builder(event_loop, title, native_options, window_settings); epi_integration::window_builder(event_loop, title, native_options, window_settings);
let mut glutin_window_context = unsafe { let glutin_window_context = unsafe {
GlutinWindowContext::new(winit_window_builder, native_options, event_loop)? GlutinWindowContext::new(winit_window_builder, native_options, event_loop)?
}; };
glutin_window_context.on_resume(event_loop)?;
if let Some(window) = &glutin_window_context.viewports.get(&ViewportId::ROOT) { if let Some(window) = &glutin_window_context.viewports.get(&ViewportId::ROOT) {
let window = window.borrow(); let window = window.borrow();
@@ -933,7 +937,12 @@ mod glow_integration {
}) })
}; };
Ok((glutin_window_context, gl)) let gl = Arc::new(gl);
let painter = egui_glow::Painter::new(gl, "", native_options.shader_version)
.unwrap_or_else(|err| panic!("An OpenGL error occurred: {err}\n"));
Ok((glutin_window_context, painter))
} }
fn init_run_state(&mut self, event_loop: &EventLoopWindowTarget<UserEvent>) -> Result<()> { fn init_run_state(&mut self, event_loop: &EventLoopWindowTarget<UserEvent>) -> Result<()> {
@@ -945,17 +954,13 @@ mod glow_integration {
.unwrap_or(&self.app_name), .unwrap_or(&self.app_name),
); );
let (mut glutin_ctx, gl) = Self::create_glutin_windowed_context( let (mut glutin_ctx, painter) = Self::create_glutin_windowed_context(
event_loop, event_loop,
storage.as_deref(), storage.as_deref(),
&self.app_name, &self.app_name,
&mut self.native_options, &mut self.native_options,
)?; )?;
let gl = Arc::new(gl); let gl = painter.gl().clone();
let painter =
egui_glow::Painter::new(gl.clone(), "", self.native_options.shader_version)
.unwrap_or_else(|err| panic!("An OpenGL error occurred: {err}\n"));
glutin_ctx.max_texture_side = painter.max_texture_side(); glutin_ctx.max_texture_side = painter.max_texture_side();
glutin_ctx.viewports[&ViewportId::ROOT] glutin_ctx.viewports[&ViewportId::ROOT]
@@ -1171,7 +1176,7 @@ mod glow_integration {
}) })
}; };
glutin glutin
.init_window(&win, event_loop) .init_viewport(&win, event_loop)
.expect("Cannot init window on egui::Context::show_viewport_immediate"); .expect("Cannot init window on egui::Context::show_viewport_immediate");
} }