fix merge

Author: raphamorim

Cargo.lock

@@ -781,7 +781,7 @@ impl ApplicationHandler<EventPayload> for Application<'_> {
                     // Background color is index 1 relative to NamedColor::Foreground
                     if index == NamedColor::Foreground as usize + 1 {
                         let grid = screen.context_manager.current_grid_mut();
-                        if let Some(context_item) = grid.get_mut(route_id) {
+                        if let Some(context_item) = grid.get_mut(route_id.into()) {
                             use crate::context::renderable::BackgroundState;
                             context_item.context_mut().renderable_content.background =
                                 Some(match color {

frontends/rioterm/src/application.rs

@@ -901,7 +901,7 @@ impl Screen<'_> {
                         context
                             .renderable_content
                             .pending_update
-                            .set_ui_damage(rio_backend::event::TerminalDamage::Full);
+                            .set_terminal_damage(rio_backend::event::TerminalDamage::Full);
                         self.renderer.set_vi_mode(has_vi_mode_enabled);
                         self.render();
                     }
@@ -920,7 +920,7 @@ impl Screen<'_> {
                         context
                             .renderable_content
                             .pending_update
-                            .set_ui_damage(rio_backend::event::TerminalDamage::Full);
+                            .set_terminal_damage(rio_backend::event::TerminalDamage::Full);
                         self.render();
                     }
                     Act::Vi(ViAction::CenterAroundViCursor) => {
@@ -937,7 +937,7 @@ impl Screen<'_> {
                         context
                             .renderable_content
                             .pending_update
-                            .set_ui_damage(rio_backend::event::TerminalDamage::Full);
+                            .set_terminal_damage(rio_backend::event::TerminalDamage::Full);
                         self.render();
                     }
                     Act::Vi(ViAction::ToggleNormalSelection) => {
@@ -946,7 +946,7 @@ impl Screen<'_> {
                             .current_mut()
                             .renderable_content
                             .pending_update
-                            .set_ui_damage(rio_backend::event::TerminalDamage::Full);
+                            .set_terminal_damage(rio_backend::event::TerminalDamage::Full);
                         self.render();
                     }
                     Act::Vi(ViAction::ToggleLineSelection) => {
@@ -955,7 +955,7 @@ impl Screen<'_> {
                             .current_mut()
                             .renderable_content
                             .pending_update
-                            .set_ui_damage(rio_backend::event::TerminalDamage::Full);
+                            .set_terminal_damage(rio_backend::event::TerminalDamage::Full);
                         self.render();
                     }
                     Act::Vi(ViAction::ToggleBlockSelection) => {
@@ -964,7 +964,7 @@ impl Screen<'_> {
                             .current_mut()
                             .renderable_content
                             .pending_update
-                            .set_ui_damage(rio_backend::event::TerminalDamage::Full);
+                            .set_terminal_damage(rio_backend::event::TerminalDamage::Full);
                         self.render();
                     }
                     Act::Vi(ViAction::ToggleSemanticSelection) => {
@@ -973,7 +973,7 @@ impl Screen<'_> {
                             .current_mut()
                             .renderable_content
                             .pending_update
-                            .set_ui_damage(rio_backend::event::TerminalDamage::Full);
+                            .set_terminal_damage(rio_backend::event::TerminalDamage::Full);
                         self.render();
                     }
                     Act::SplitRight => {

frontends/rioterm/src/screen/mod.rs

@@ -46,7 +46,9 @@ impl<'a> WgpuContext<'a> {
         #[cfg(not(target_arch = "wasm32"))]
         {
             tracing::info!("Available adapters:");
-            for a in instance.enumerate_adapters(wgpu::Backends::all()) {
+            for a in futures::executor::block_on(
+                instance.enumerate_adapters(wgpu::Backends::all()),
+            ) {
                 tracing::info!("    {:?}", a.get_info())
             }
         }

sugarloaf/src/context/webgpu.rs

@@ -1488,11 +1488,11 @@ impl WgpuRenderer {
                 .device
                 .create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
                     label: None,
-                    push_constant_ranges: &[],
                     bind_group_layouts: &[
                         &constant_bind_group_layout,
                         &layout_bind_group_layout,
                     ],
+                    ..Default::default()
                 });
 
         let sampler = context.device.create_sampler(&wgpu::SamplerDescriptor {
@@ -1501,7 +1501,7 @@ impl WgpuRenderer {
             address_mode_w: wgpu::AddressMode::ClampToEdge,
             mag_filter: wgpu::FilterMode::Linear,
             min_filter: wgpu::FilterMode::Linear,
-            mipmap_filter: wgpu::FilterMode::Linear,
+            mipmap_filter: wgpu::MipmapFilterMode::Linear,
             lod_min_clamp: 0f32,
             lod_max_clamp: 0f32,
             ..Default::default()
@@ -1645,7 +1645,7 @@ impl WgpuRenderer {
                     },
                     depth_stencil: None,
                     multisample: wgpu::MultisampleState::default(),
-                    multiview: None,
+                    multiview_mask: None,
                 });
 
         let vertex_buffer = context.device.create_buffer(&wgpu::BufferDescriptor {