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

Renamed gl_window to glutin_ctx in init_run_state and initializate max_texture_side, and now on any egui_winit has max_texture_side set

Browse Source
This commit is contained in:
Konkitoman
2023-09-26 18:59:42 +03:00
parent 6a5838c119
commit 43ad25a4d9
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -528,6 +528,8 @@ mod glow_integration {
swap_interval: glutin::surface::SwapInterval, swap_interval: glutin::surface::SwapInterval,
gl_config: glutin::config::Config, gl_config: glutin::config::Config,
max_texture_side: usize,
current_gl_context: Option<glutin::context::PossiblyCurrentContext>, current_gl_context: Option<glutin::context::PossiblyCurrentContext>,
not_current_gl_context: Option<glutin::context::NotCurrentContext>, not_current_gl_context: Option<glutin::context::NotCurrentContext>,
@@ -692,6 +694,8 @@ mod glow_integration {
viewports: windows, viewports: windows,
builders, builders,
viewports_maps: window_maps, viewports_maps: window_maps,
// This is initializate in init_run_state
max_texture_side: 0,
}) })
} }
@@ -787,7 +791,7 @@ mod glow_integration {
if win.egui_winit.is_none() { if win.egui_winit.is_none() {
let mut egui_winit = egui_winit::State::new(event_loop); let mut egui_winit = egui_winit::State::new(event_loop);
// egui_winit.set_max_texture_side(max_texture_side); egui_winit.set_max_texture_side(self.max_texture_side);
egui_winit.set_pixels_per_point(native_pixels_per_point); egui_winit.set_pixels_per_point(native_pixels_per_point);
win.egui_winit = Some(egui_winit); win.egui_winit = Some(egui_winit);
} }
@@ -942,7 +946,7 @@ mod glow_integration {
.unwrap_or(&self.app_name), .unwrap_or(&self.app_name),
); );
let (gl_window, gl) = Self::create_glutin_windowed_context( let (mut glutin_ctx, gl) = Self::create_glutin_windowed_context(
event_loop, event_loop,
storage.as_deref(), storage.as_deref(),
&self.app_name, &self.app_name,
@@ -954,8 +958,10 @@ mod glow_integration {
egui_glow::Painter::new(gl.clone(), "", self.native_options.shader_version) egui_glow::Painter::new(gl.clone(), "", self.native_options.shader_version)
.unwrap_or_else(|err| panic!("An OpenGL error occurred: {err}\n")); .unwrap_or_else(|err| panic!("An OpenGL error occurred: {err}\n"));
glutin_ctx.max_texture_side = painter.max_texture_side();
let system_theme = system_theme( let system_theme = system_theme(
&gl_window &glutin_ctx
.window(ViewportId::MAIN) .window(ViewportId::MAIN)
.read() .read()
.window .window
@@ -965,7 +971,7 @@ mod glow_integration {
&self.native_options, &self.native_options,
); );
let mut integration = epi_integration::EpiIntegration::new( let mut integration = epi_integration::EpiIntegration::new(
&gl_window &glutin_ctx
.window(ViewportId::MAIN) .window(ViewportId::MAIN)
.read() .read()
.window .window
@@ -983,7 +989,7 @@ mod glow_integration {
); );
#[cfg(feature = "accesskit")] #[cfg(feature = "accesskit")]
{ {
let window = &gl_window.viewports[&ViewportId::MAIN]; let window = &glutin_ctx.viewports[&ViewportId::MAIN];
let window = &mut *window.write(); let window = &mut *window.write();
integration.init_accesskit( integration.init_accesskit(
window.egui_winit.as_mut().unwrap(), window.egui_winit.as_mut().unwrap(),
@@ -995,7 +1001,7 @@ mod glow_integration {
integration.egui_ctx.set_visuals(theme.egui_visuals()); integration.egui_ctx.set_visuals(theme.egui_visuals());
if self.native_options.mouse_passthrough { if self.native_options.mouse_passthrough {
gl_window glutin_ctx
.window(ViewportId::MAIN) .window(ViewportId::MAIN)
.read() .read()
.window .window
@@ -1029,7 +1035,7 @@ mod glow_integration {
.expect("Single-use AppCreator has unexpectedly already been taken"); .expect("Single-use AppCreator has unexpectedly already been taken");
let mut app; let mut app;
{ {
let window = gl_window.window(ViewportId::MAIN); let window = glutin_ctx.window(ViewportId::MAIN);
let window = &mut *window.write(); let window = &mut *window.write();
app = app_creator(&epi::CreationContext { app = app_creator(&epi::CreationContext {
egui_ctx: integration.egui_ctx.clone(), egui_ctx: integration.egui_ctx.clone(),
@@ -1051,7 +1057,7 @@ mod glow_integration {
} }
} }
let glutin_ctx = Arc::new(RwLock::new(gl_window)); let glutin_ctx = Arc::new(RwLock::new(glutin_ctx));
let painter = Arc::new(RwLock::new(painter)); let painter = Arc::new(RwLock::new(painter));
// c_* means that will be taken by the next closure // c_* means that will be taken by the next closure