Update egui to 0.34

anti-social · Maximkaaa · commit 552923bd9a32 · 2026-04-01T06:19:39.000+09:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -48,9 +48,9 @@ chumsky = "0.12"
 console_log = "1"
 console_error_panic_hook = "0.1"
 csv = "1.3"
-egui = "0.33"
-egui-wgpu = "0.33"
-eframe = { version = "0.33", default-features = false }
+egui = "0.34"
+egui-wgpu = "0.34"
+eframe = { version = "0.34", default-features = false }
 either = "1"
 env_logger = "0.11"
 fontdb = { version = "0.23", default-features = false }
@@ -103,5 +103,5 @@ wasm-bindgen-derive = "0.2"
 wasm-bindgen-futures = "0.4"
 web-time = "1"
 web-sys = "0.3, <0.3.92"
-wgpu = { version = "27.0.1", default-features = false, features = ["metal", "wgsl", "webgl", "vulkan", "gles"] }
+wgpu = { version = "29.0.0", default-features = false, features = ["metal", "wgsl", "webgl", "vulkan", "gles"] }
 winit = { version = "0.30", default-features = false }
diff --git a/galileo-egui/src/egui_map.rs b/galileo-egui/src/egui_map.rs
@@ -36,8 +36,8 @@ use crate::EguiMapOptions;
 /// }
 ///
 /// impl eframe::App for MapApp {
-///     fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-///         egui::CentralPanel::default().show(ctx, |ui| {
+///     fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+///         egui::CentralPanel::default().show_inside(ui, |ui| {
 ///             EguiMap::new(&mut self.map)
 ///                 .with_position(&mut self.position)
 ///                 .with_resolution(&mut self.resolution)
diff --git a/galileo-egui/src/init.rs b/galileo-egui/src/init.rs
@@ -13,8 +13,8 @@ struct MapApp {
 }
 
 impl eframe::App for MapApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             self.map.render(ui);
         });
     }
diff --git a/galileo/examples/egui_app.rs b/galileo/examples/egui_app.rs
@@ -52,14 +52,14 @@ impl EguiMapApp {
 }
 
 impl eframe::App for EguiMapApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             EguiMap::new(&mut self.map)
                 .with_position(&mut self.position)
                 .with_resolution(&mut self.resolution)
                 .show_ui(ui);
 
-            egui::Window::new("Galileo map").show(ctx, |ui| {
+            egui::Window::new("Galileo map").show(ui, |ui| {
                 ui.label("Map center position:");
                 ui.label(format!(
                     "Lat: {:.4} Lon: {:.4}",
diff --git a/galileo/examples/labels.rs b/galileo/examples/labels.rs
@@ -157,11 +157,11 @@ impl EguiMapApp {
 }
 
 impl eframe::App for EguiMapApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             EguiMap::new(&mut self.map).show_ui(ui);
 
-            egui::Window::new("Galileo map").show(ctx, |ui| {
+            egui::Window::new("Galileo map").show(ui.ctx(), |ui| {
                 ui.label("Text format:");
 
                 ui.horizontal(|ui| {
diff --git a/galileo/examples/raster_tiles_switch.rs b/galileo/examples/raster_tiles_switch.rs
@@ -33,14 +33,14 @@ impl App {
 }
 
 impl eframe::App for App {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             EguiMap::new(&mut self.map).show_ui(ui);
         });
 
         egui::Window::new("Buttons")
             .title_bar(false)
-            .show(ctx, |ui| {
+            .show(ui.ctx(), |ui| {
                 ui.horizontal(|ui| {
                     if ui.button("winter").clicked() {
                         self.switch_layer("winter-v2");
diff --git a/galileo/examples/resolution_and_zlevel_interpolation.rs b/galileo/examples/resolution_and_zlevel_interpolation.rs
@@ -26,14 +26,14 @@ struct App {
 }
 
 impl eframe::App for App {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             EguiMap::new(&mut self.map).show_ui(ui);
         });
 
         egui::Window::new("Buttons")
             .title_bar(false)
-            .show(ctx, |ui| {
+            .show(ui.ctx(), |ui| {
                 ui.horizontal(|ui| {
                     if ui.button("Resolution").clicked() {
                         self.set_style(with_overlay_rule(resolution_based_interpolation()));
diff --git a/galileo/examples/vector_tiles.rs b/galileo/examples/vector_tiles.rs
@@ -26,14 +26,14 @@ struct App {
 }
 
 impl eframe::App for App {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             EguiMap::new(&mut self.map).show_ui(ui);
         });
 
         egui::Window::new("Buttons")
             .title_bar(false)
-            .show(ctx, |ui| {
+            .show(ui.ctx(), |ui| {
                 ui.horizontal(|ui| {
                     if ui.button("Default style").clicked() {
                         self.set_style(default_style());
diff --git a/galileo/examples/vector_tiles_expressions.rs b/galileo/examples/vector_tiles_expressions.rs
@@ -29,14 +29,14 @@ struct App {
 }
 
 impl eframe::App for App {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             EguiMap::new(&mut self.map).show_ui(ui);
         });
 
         egui::Window::new("Buttons")
             .title_bar(false)
-            .show(ctx, |ui| {
+            .show(ui.ctx(), |ui| {
                 ui.horizontal(|ui| {
                     if ui.button("Linear Interpolation").clicked() {
                         self.set_style(with_overlay_rule(linear_interpolation_style()));
diff --git a/galileo/src/render/wgpu/effects/horizon.rs b/galileo/src/render/wgpu/effects/horizon.rs
@@ -113,8 +113,8 @@ impl HorizonPipeline {
         let targets = default_targets(format);
         let layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
             label: None,
-            bind_group_layouts: &[map_view_layout, &horizon_bind_group_layout],
-            push_constant_ranges: &[],
+            bind_group_layouts: &[Some(map_view_layout), Some(&horizon_bind_group_layout)],
+            immediate_size: 0,
         });
         let desc =
             pipelines::default_pipeline_descriptor(&layout, &shader, &targets, &buffers, false);
diff --git a/galileo/src/render/wgpu/mod.rs b/galileo/src/render/wgpu/mod.rs
@@ -15,8 +15,8 @@ use parking_lot::Mutex;
 use wgpu::util::DeviceExt;
 use wgpu::{
     Adapter, BindGroup, Buffer, BufferAddress, BufferDescriptor, BufferUsages,
-    COPY_BYTES_PER_ROW_ALIGNMENT, Device, Extent3d, Origin3d, Queue,
-    RenderPassDepthStencilAttachment, StoreOp, Surface, SurfaceConfiguration, SurfaceError,
+    COPY_BYTES_PER_ROW_ALIGNMENT, CurrentSurfaceTexture, Device, Extent3d, Origin3d, Queue,
+    RenderPassDepthStencilAttachment, StoreOp, Surface, SurfaceConfiguration, SurfaceStatus,
     SurfaceTexture, TexelCopyBufferInfo, TexelCopyBufferLayout, TexelCopyTextureInfo, Texture,
     TextureAspect, TextureDescriptor, TextureDimension, TextureFormat, TextureUsages, TextureView,
     TextureViewDescriptor, WasmNotSendSync,
@@ -94,10 +94,19 @@ impl RenderTargetTexture<'_> {
 }
 
 impl RenderTarget {
-    fn texture(&self) -> Result<RenderTargetTexture<'_>, SurfaceError> {
+    fn texture(&self) -> Result<RenderTargetTexture<'_>, SurfaceStatus> {
         match &self {
             RenderTarget::Surface { surface, .. } => {
-                Ok(RenderTargetTexture::Surface(surface.get_current_texture()?))
+                let texture = match surface.get_current_texture() {
+                    CurrentSurfaceTexture::Success(texture) => texture,
+                    CurrentSurfaceTexture::Suboptimal(texture) => texture,
+                    CurrentSurfaceTexture::Lost => return Err(SurfaceStatus::Lost),
+                    CurrentSurfaceTexture::Occluded => return Err(SurfaceStatus::Occluded),
+                    CurrentSurfaceTexture::Outdated => return Err(SurfaceStatus::Outdated),
+                    CurrentSurfaceTexture::Timeout => return Err(SurfaceStatus::Timeout),
+                    CurrentSurfaceTexture::Validation => return Err(SurfaceStatus::Validation),
+                };
+                Ok(RenderTargetTexture::Surface(texture))
             }
             RenderTarget::Texture(texture, _) => Ok(RenderTargetTexture::Texture(texture)),
         }
@@ -370,9 +379,12 @@ impl WgpuRenderer {
             }
         }
 
-        wgpu::Instance::new(&wgpu::InstanceDescriptor {
+        wgpu::Instance::new(wgpu::InstanceDescriptor {
             backends,
-            ..Default::default()
+            flags: Default::default(),
+            memory_budget_thresholds: Default::default(),
+            backend_options: Default::default(),
+            display: None,
         })
     }
 
@@ -534,9 +546,9 @@ impl WgpuRenderer {
     }
 
     /// Returns the image of the last render operation.
-    pub async fn get_image(&self) -> Result<Vec<u8>, SurfaceError> {
+    pub async fn get_image(&self) -> Result<Vec<u8>, SurfaceStatus> {
         let Some(renderer_targets) = &self.renderer_targets else {
-            return Err(SurfaceError::Lost);
+            return Err(SurfaceStatus::Lost);
         };
 
         let render_target_size = renderer_targets.render_target.size();
@@ -606,12 +618,12 @@ impl WgpuRenderer {
                 Ok(()) => {}
                 Err(err) => {
                     log::error!("Writing to image buffer failed: {err:?}.");
-                    return Err(SurfaceError::Lost);
+                    return Err(SurfaceStatus::Lost);
                 }
             },
             None => {
                 log::error!("Channel was closed");
-                return Err(SurfaceError::Lost);
+                return Err(SurfaceStatus::Lost);
             }
         }
 
@@ -666,6 +678,7 @@ impl WgpuRenderer {
                     depth_stencil_attachment: None,
                     timestamp_writes: None,
                     occlusion_query_set: None,
+                    multiview_mask: None,
                 });
             }
 
@@ -678,7 +691,7 @@ impl WgpuRenderer {
     }
 
     /// Renders the map.
-    pub fn render(&self, map: &Map) -> Result<(), SurfaceError> {
+    pub fn render(&self, map: &Map) -> Result<(), SurfaceStatus> {
         let Some(renderer_targets) = &self.renderer_targets else {
             return Ok(());
         };
@@ -782,6 +795,7 @@ impl WgpuRenderer {
                 }),
                 timestamp_writes: None,
                 occlusion_query_set: None,
+                multiview_mask: None,
             });
 
             renderer_targets.pipelines.set_bindings(&mut render_pass);
@@ -942,6 +956,7 @@ impl Canvas for WgpuCanvas<'_> {
                 }),
                 timestamp_writes: None,
                 occlusion_query_set: None,
+                multiview_mask: None,
             });
 
             let display_instances: Vec<_> = bundles
@@ -1143,6 +1158,7 @@ impl Canvas for WgpuCanvas<'_> {
                 }),
                 timestamp_writes: None,
                 occlusion_query_set: None,
+                multiview_mask: None,
             });
 
             let instances: Vec<DisplayInstance> = filtered_sets
diff --git a/galileo/src/render/wgpu/pipelines/clip.rs b/galileo/src/render/wgpu/pipelines/clip.rs
@@ -34,14 +34,14 @@ impl ClipPipeline {
         let targets = default_targets(format);
         let layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
             label: None,
-            bind_group_layouts: &[map_view_layout],
-            push_constant_ranges: &[],
+            bind_group_layouts: &[Some(map_view_layout)],
+            immediate_size: 0,
         });
 
         let depth_stencil = Some(DepthStencilState {
             format: DEPTH_FORMAT,
-            depth_write_enabled: false,
-            depth_compare: CompareFunction::Always,
+            depth_write_enabled: Some(false),
+            depth_compare: Some(CompareFunction::Always),
             stencil: StencilState {
                 front: clip_stencil_state,
                 back: clip_stencil_state,
diff --git a/galileo/src/render/wgpu/pipelines/dot.rs b/galileo/src/render/wgpu/pipelines/dot.rs
@@ -29,8 +29,8 @@ impl DotPipeline {
         let targets = default_targets(format);
         let layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
             label: None,
-            bind_group_layouts: &[map_view_layout],
-            push_constant_ranges: &[],
+            bind_group_layouts: &[Some(map_view_layout)],
+            immediate_size: 0,
         });
         let stencil_state = StencilFaceState {
             compare: CompareFunction::Equal,
@@ -49,8 +49,8 @@ impl DotPipeline {
         };
         let depth_stencil = Some(DepthStencilState {
             format: DEPTH_FORMAT,
-            depth_write_enabled: true,
-            depth_compare: CompareFunction::LessEqual,
+            depth_write_enabled: Some(true),
+            depth_compare: Some(CompareFunction::LessEqual),
             stencil: StencilState {
                 front: stencil_state,
                 back: stencil_state,
diff --git a/galileo/src/render/wgpu/pipelines/image.rs b/galileo/src/render/wgpu/pipelines/image.rs
@@ -36,8 +36,8 @@ impl ImagePipeline {
 
         let layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
             label: None,
-            bind_group_layouts: &[map_view_layout, texture_bind_group_layout],
-            push_constant_ranges: &[],
+            bind_group_layouts: &[Some(map_view_layout), Some(texture_bind_group_layout)],
+            immediate_size: 0,
         });
 
         let targets = default_targets(format);
diff --git a/galileo/src/render/wgpu/pipelines/map_ref.rs b/galileo/src/render/wgpu/pipelines/map_ref.rs
@@ -22,8 +22,8 @@ impl MapRefPipeline {
         let targets = default_targets(format);
         let layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
             label: None,
-            bind_group_layouts: &[map_view_layout],
-            push_constant_ranges: &[],
+            bind_group_layouts: &[Some(map_view_layout)],
+            immediate_size: 0,
         });
         let mut desc =
             pipelines::default_pipeline_descriptor(&layout, &shader, &targets, &buffers, false);
diff --git a/galileo/src/render/wgpu/pipelines/mod.rs b/galileo/src/render/wgpu/pipelines/mod.rs
@@ -268,7 +268,7 @@ impl Pipelines {
             address_mode_w: wgpu::AddressMode::ClampToEdge,
             mag_filter: wgpu::FilterMode::Linear,
             min_filter: wgpu::FilterMode::Linear,
-            mipmap_filter: wgpu::FilterMode::Nearest,
+            mipmap_filter: wgpu::MipmapFilterMode::Nearest,
             ..Default::default()
         });
 
@@ -339,8 +339,8 @@ pub(crate) fn default_pipeline_descriptor<'a>(
         },
         depth_stencil: Some(DepthStencilState {
             format: DEPTH_FORMAT,
-            depth_write_enabled: false,
-            depth_compare: CompareFunction::Always,
+            depth_write_enabled: Some(false),
+            depth_compare: Some(CompareFunction::Always),
             stencil: StencilState {
                 front: stencil_state,
                 back: stencil_state,
@@ -354,7 +354,7 @@ pub(crate) fn default_pipeline_descriptor<'a>(
             mask: !0,
             alpha_to_coverage_enabled: false,
         },
-        multiview: None,
+        multiview_mask: None,
         cache: Default::default(),
     }
 }
diff --git a/galileo/src/render/wgpu/pipelines/screen_set_image.rs b/galileo/src/render/wgpu/pipelines/screen_set_image.rs
@@ -53,8 +53,8 @@ impl ScreenSetImagePipeline {
         let targets = default_targets(format);
         let layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
             label: None,
-            bind_group_layouts: &[map_view_layout, texture_bind_group_layout],
-            push_constant_ranges: &[],
+            bind_group_layouts: &[Some(map_view_layout), Some(texture_bind_group_layout)],
+            immediate_size: 0,
         });
         let mut desc = default_pipeline_descriptor(&layout, &shader, &targets, &buffers, false);
 
diff --git a/galileo/src/render/wgpu/pipelines/screen_set_vertex.rs b/galileo/src/render/wgpu/pipelines/screen_set_vertex.rs
@@ -43,8 +43,8 @@ impl ScreenSetPipeline {
         let targets = default_targets(format);
         let layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
             label: None,
-            bind_group_layouts: &[map_view_layout],
-            push_constant_ranges: &[],
+            bind_group_layouts: &[Some(map_view_layout)],
+            immediate_size: 0,
         });
         let mut desc = default_pipeline_descriptor(&layout, &shader, &targets, &buffers, false);
 

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ struct MapApp {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`impl eframe::App for MapApp {`
`16`		`- fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {`
`17`		`- egui::CentralPanel::default().show(ctx, \|ui\| {`
	`16`	`+ fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {`
	`17`	`+ egui::CentralPanel::default().show_inside(ui, \|ui\| {`
`18`	`18`	`self.map.render(ui);`
`19`	`19`	`});`
`20`	`20`	`}`