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

eframe: Improve `glow` context switching (#4814) 

Improved `change_gl_context()`

**Before:** 
Create a new `not_current_glcontext`. 

**After:**
If `not_current_glcontext` exists, apply it. Otherwise, create it. 

This will make the program smoother when dragging, etc.
This commit is contained in:
rustbasic 2024-07-11 18:43:21 +09:00 committed by GitHub
parent 3b8453e920
commit 20359a870f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -588,6 +588,7 @@ impl GlowWinitRunning {
let GlutinWindowContext { let GlutinWindowContext {
viewports, viewports,
current_gl_context, current_gl_context,
not_current_gl_context,
.. ..
} = &mut *glutin; } = &mut *glutin;
let viewport = &viewports[&viewport_id]; let viewport = &viewports[&viewport_id];
@ -602,7 +603,7 @@ impl GlowWinitRunning {
{ {
frame_timer.pause(); frame_timer.pause();
change_gl_context(current_gl_context, gl_surface); change_gl_context(current_gl_context, not_current_gl_context, gl_surface);
frame_timer.resume(); frame_timer.resume();
} }
@ -645,6 +646,7 @@ impl GlowWinitRunning {
let GlutinWindowContext { let GlutinWindowContext {
viewports, viewports,
current_gl_context, current_gl_context,
not_current_gl_context,
.. ..
} = &mut *glutin; } = &mut *glutin;
@ -664,7 +666,7 @@ impl GlowWinitRunning {
{ {
// We may need to switch contexts again, because of immediate viewports: // We may need to switch contexts again, because of immediate viewports:
frame_timer.pause(); frame_timer.pause();
change_gl_context(current_gl_context, gl_surface); change_gl_context(current_gl_context, not_current_gl_context, gl_surface);
frame_timer.resume(); frame_timer.resume();
} }
@ -866,6 +868,7 @@ impl GlowWinitRunning {
fn change_gl_context( fn change_gl_context(
current_gl_context: &mut Option<glutin::context::PossiblyCurrentContext>, current_gl_context: &mut Option<glutin::context::PossiblyCurrentContext>,
not_current_gl_context: &mut Option<glutin::context::NotCurrentContext>,
gl_surface: &glutin::surface::Surface<glutin::surface::WindowSurface>, gl_surface: &glutin::surface::Surface<glutin::surface::WindowSurface>,
) { ) {
crate::profile_function!(); crate::profile_function!();
@ -884,7 +887,9 @@ fn change_gl_context(
} }
} }
let not_current = { let not_current = if let Some(not_current_context) = not_current_gl_context.take() {
not_current_context
} else {
crate::profile_scope!("make_not_current"); crate::profile_scope!("make_not_current");
current_gl_context current_gl_context
.take() .take()
@ -1227,7 +1232,11 @@ 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 {
change_gl_context(&mut self.current_gl_context, gl_surface); change_gl_context(
&mut self.current_gl_context,
&mut self.not_current_gl_context,
gl_surface,
);
gl_surface.resize( gl_surface.resize(
self.current_gl_context self.current_gl_context
.as_ref() .as_ref()
@ -1459,6 +1468,7 @@ fn render_immediate_viewport(
let GlutinWindowContext { let GlutinWindowContext {
current_gl_context, current_gl_context,
not_current_gl_context,
viewports, viewports,
.. ..
} = &mut *glutin; } = &mut *glutin;
@ -1479,7 +1489,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); change_gl_context(current_gl_context, not_current_gl_context, gl_surface);
let current_gl_context = current_gl_context.as_ref().unwrap(); let current_gl_context = current_gl_context.as_ref().unwrap();