migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-29 04:40:03 -04:00
Code Activity

Use Rust edition 2024 (#7280)

Browse Source
This commit is contained in:
Emil Ernerfeldt
2025-06-30 14:01:57 +02:00
committed by GitHub
parent 962c8e26a8
commit b2995dcb83
190 changed files with 427 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/egui_glow/src/lib.rs
View File

@@ -62,12 +62,8 @@ macro_rules! check_for_gl_error {
/// ```
#[macro_export]
macro_rules! check_for_gl_error_even_in_release {
($gl: expr) => {{
$crate::check_for_gl_error_impl($gl, file!(), line!(), "")
}};
($gl: expr, $context: literal) => {{
$crate::check_for_gl_error_impl($gl, file!(), line!(), $context)
}};
($gl: expr) => {{ $crate::check_for_gl_error_impl($gl, file!(), line!(), "") }};
($gl: expr, $context: literal) => {{ $crate::check_for_gl_error_impl($gl, file!(), line!(), $context) }};
}
#[doc(hidden)]

4
crates/egui_glow/src/painter.rs
View File

@@ -445,7 +445,9 @@ impl Painter {
if let Some(callback) = callback.callback.downcast_ref::<CallbackFn>() {
(callback.f)(info, self);
} else {
log::warn!("Warning: Unsupported render callback. Expected egui_glow::CallbackFn");
log::warn!(
"Warning: Unsupported render callback. Expected egui_glow::CallbackFn"
);
}
check_for_gl_error!(&self.gl, "callback");

6
crates/egui_glow/src/shader_version.rs
View File

@@ -47,11 +47,7 @@ impl ShaderVersion {
.try_into()
.unwrap();
if es {
if maj >= 3 {
Self::Es300
} else {
Self::Es100
}
if maj >= 3 { Self::Es300 } else { Self::Es100 }
} else if maj > 1 || (maj == 1 && min >= 40) {
Self::Gl140
} else {

2
crates/egui_glow/src/winit.rs
View File

@@ -1,8 +1,8 @@
use ahash::HashSet;
use egui::{ViewportId, ViewportOutput};
pub use egui_winit;
use egui_winit::winit;
pub use egui_winit::EventResponse;
use egui_winit::winit;
use crate::shader_version::ShaderVersion;