skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eframe: Early-out from context switching the `glow` backend (#4284) 

* Closes https://github.com/emilk/egui/issues/4173
This commit is contained in:
Emil Ernerfeldt 2024-03-30 18:38:59 +01:00 committed by GitHub
parent 549b243228
commit e03ea2e17d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
crates/eframe/src/native/glow_integration.rs
View File

@ -836,6 +836,13 @@ fn change_gl_context(
) { ) {
crate::profile_function!(); crate::profile_function!();
if let Some(current_gl_context) = current_gl_context {
crate::profile_scope!("is_current");
if gl_surface.is_current(current_gl_context) {
return; // Early-out to save a lot of time.
}
}
let not_current = { let not_current = {
crate::profile_scope!("make_not_current"); crate::profile_scope!("make_not_current");
current_gl_context current_gl_context
@ -844,6 +851,7 @@ fn change_gl_context(
.make_not_current() .make_not_current()
.unwrap() .unwrap()
}; };
crate::profile_scope!("make_current"); crate::profile_scope!("make_current");
*current_gl_context = Some(not_current.make_current(gl_surface).unwrap()); *current_gl_context = Some(not_current.make_current(gl_surface).unwrap());
} }
@ -1178,15 +1186,7 @@ impl GlutinWindowContext {
if let Some(viewport) = self.viewports.get(&viewport_id) { if let Some(viewport) = self.viewports.get(&viewport_id) {
if let Some(gl_surface) = &viewport.gl_surface { if let Some(gl_surface) = &viewport.gl_surface {
self.current_gl_context = Some( change_gl_context(&mut self.current_gl_context, gl_surface);
self.current_gl_context
.take()
.unwrap()
.make_not_current()
.unwrap()
.make_current(gl_surface)
.unwrap(),
);
gl_surface.resize( gl_surface.resize(
self.current_gl_context self.current_gl_context
.as_ref() .as_ref()
@ -1436,18 +1436,7 @@ fn render_immediate_viewport(
let screen_size_in_pixels: [u32; 2] = window.inner_size().into(); let screen_size_in_pixels: [u32; 2] = window.inner_size().into();
{ change_gl_context(current_gl_context, gl_surface);
crate::profile_function!("context-switch");
*current_gl_context = Some(
current_gl_context
.take()
.unwrap()
.make_not_current()
.unwrap()
.make_current(gl_surface)
.unwrap(),
);
}
let current_gl_context = current_gl_context.as_ref().unwrap(); let current_gl_context = current_gl_context.as_ref().unwrap();