Update egui and wgpu

Cargo.toml

@@ -198,8 +198,8 @@ webbrowser = "0.8"
 winit = "0.28.7"
 # TODO(andreas): Try to get rid of `fragile-send-sync-non-atomic-wasm`. This requires re_renderer being aware of single-thread restriction on resources.
 # See also https://gpuweb.github.io/gpuweb/explainer/#multithreading-transfer (unsolved part of the Spec as of writing!)
-wgpu = { version = "0.17.0", features = ["fragile-send-sync-non-atomic-wasm"] }
-wgpu-core = "0.17.0"
+wgpu = { version = "0.18.0", features = ["fragile-send-sync-non-atomic-wasm"] }
+wgpu-core = "0.18.0"
 xshell = "0.2"
 zip = { version = "0.6", default-features = false }
 zune-core = "0.2"
@@ -230,3 +230,9 @@ debug = true
 # If that is not possible, patch to a branch that has a PR open on the upstream repo.
 # As a last resport, patch with a commit to our own repository.
 # ALWAYS document what PR the commit hash is part of, or when it was merged into the upstream trunk.
+ecolor = { git = "https://github.com/emilk/egui.git", commit = "b9500460b91dae60d44a8e615bcad5671845cf01" }
+eframe = { git = "https://github.com/emilk/egui.git", commit = "b9500460b91dae60d44a8e615bcad5671845cf01" }
+egui = { git = "https://github.com/emilk/egui.git", commit = "b9500460b91dae60d44a8e615bcad5671845cf01" }
+egui-wgpu = { git = "https://github.com/emilk/egui.git", commit = "b9500460b91dae60d44a8e615bcad5671845cf01" }
+emath = { git = "https://github.com/emilk/egui.git", commit = "b9500460b91dae60d44a8e615bcad5671845cf01" }
+epaint = { git = "https://github.com/emilk/egui.git", commit = "b9500460b91dae60d44a8e615bcad5671845cf01" }

crates/re_renderer/examples/framework.rs

@@ -112,7 +112,9 @@ impl<E: Example + 'static> Application<E> {
         let size = window.inner_size();
         let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
             backends: supported_backends(),
+            flags: wgpu::InstanceFlags::default(),
             dx12_shader_compiler: wgpu::Dx12Compiler::Fxc,
+            gles_minor_version: wgpu::Gles3MinorVersion::Automatic,
         });
         #[allow(unsafe_code, clippy::undocumented_unsafe_blocks)]
         let surface = unsafe { instance.create_surface(&window) }.unwrap();
@@ -282,10 +284,12 @@ impl<E: Example + 'static> Application<E> {
                                     resolve_target: None,
                                     ops: wgpu::Operations {
                                         load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),
-                                        store: true,
+                                        store: wgpu::StoreOp::Store,
                                     },
                                 })],
                                 depth_stencil_attachment: None,
+                                timestamp_writes: None,
+                                occlusion_query_set: None,
                             });
 
                         for draw_result in &draw_results {

crates/re_renderer/src/draw_phases/outlines.rs

@@ -354,17 +354,19 @@ impl OutlineMaskProcessor {
                 resolve_target: None, // We're going to do a manual resolve.
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
-                    store: true,
+                    store: wgpu::StoreOp::Store,
                 },
             })],
             depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment {
                 view: &self.mask_depth.default_view,
                 depth_ops: Some(wgpu::Operations {
                     load: ViewBuilder::DEFAULT_DEPTH_CLEAR,
-                    store: false,
+                    store: wgpu::StoreOp::Discard,
                 }),
                 stencil_ops: None,
             }),
+            timestamp_writes: None,
+            occlusion_query_set: None,
         })
     }
 
@@ -377,7 +379,7 @@ impl OutlineMaskProcessor {
 
         let ops = wgpu::Operations {
             load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT), // Clear is the closest to "don't care"
-            store: true,
+            store: wgpu::StoreOp::Store,
         };
 
         // Initialize the jump flooding into voronoi texture 0 by looking at the mask texture.
@@ -390,6 +392,8 @@ impl OutlineMaskProcessor {
                     ops,
                 })],
                 depth_stencil_attachment: None,
+                timestamp_writes: None,
+                occlusion_query_set: None,
             });
 
             let render_pipeline_init =
@@ -412,6 +416,8 @@ impl OutlineMaskProcessor {
                     ops,
                 })],
                 depth_stencil_attachment: None,
+                timestamp_writes: None,
+                occlusion_query_set: None,
             });
 
             jumpflooding_step.set_pipeline(render_pipeline_step);

crates/re_renderer/src/draw_phases/picking_layer.rs

@@ -321,17 +321,19 @@ impl PickingLayerProcessor {
                 resolve_target: None,
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
-                    store: true, // Store for readback!
+                    store: wgpu::StoreOp::Store, // Store for readback!
                 },
             })],
             depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment {
                 view: &self.picking_depth_target.default_view,
                 depth_ops: Some(wgpu::Operations {
                     load: ViewBuilder::DEFAULT_DEPTH_CLEAR,
-                    store: true, // Store for readback!
+                    store: wgpu::StoreOp::Store, // Store for readback!
                 }),
                 stencil_ops: None,
             }),
+            timestamp_writes: None,
+            occlusion_query_set: None,
         });
 
         pass.set_bind_group(0, &self.bind_group_0, &[]);
@@ -590,10 +592,12 @@ impl DepthReadbackWorkaround {
                 resolve_target: None,
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
-                    store: true, // Store for readback!
+                    store: wgpu::StoreOp::Store, // Store for readback!
                 },
             })],
             depth_stencil_attachment: None,
+            timestamp_writes: None,
+            occlusion_query_set: None,
         });
 
         let pipeline = pools.render_pipelines.get_resource(self.render_pipeline)?;

crates/re_renderer/src/draw_phases/screenshot.rs

@@ -88,10 +88,12 @@ impl ScreenshotProcessor {
                 resolve_target: None,
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
-                    store: true,
+                    store: wgpu::StoreOp::Store,
                 },
             })],
             depth_stencil_attachment: None,
+            timestamp_writes: None,
+            occlusion_query_set: None,
         });
 
         pass

crates/re_renderer/src/view_builder.rs

@@ -556,17 +556,19 @@ impl ViewBuilder {
                         }),
                         // Don't care about the result, it's going to be resolved to the resolve target.
                         // This can have be much better perf, especially on tiler gpus.
-                        store: false,
+                        store: wgpu::StoreOp::Discard,
                     },
                 })],
                 depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment {
                     view: &setup.depth_buffer.default_view,
                     depth_ops: Some(wgpu::Operations {
                         load: Self::DEFAULT_DEPTH_CLEAR,
-                        store: false,
+                        store: wgpu::StoreOp::Discard,
                     }),
                     stencil_ops: None,
                 }),
+                timestamp_writes: None,
+                occlusion_query_set: None,
             });
 
             pass.set_bind_group(0, &setup.bind_group_0, &[]);

deny.toml

@@ -48,12 +48,16 @@ deny = [
 skip = [
   { name = "ahash" },                # Popular crate + fast release schedule = lots of crates still using old versions
   { name = "base64" },               # Too popular
-  { name = "foreign-types" },        # used for cocoa bindings. wgpu uses newer than winit.
+  { name = "foreign-types" },        # used for cocoa bindings. wgpu uses newer than eframe.
   { name = "foreign-types-shared" }, # as above.
   { name = "memoffset" },            # Small crate
   { name = "nix" },                  # difficult to avoid :(
   { name = "prettyplease" },         # Old version being used by prost
   { name = "time" },                 # Too popular
+  { name = "hashbrown" },            # Old version used by polar-rs
+  { name = "spin" },                 # Old version used by rusttls
+  { name = "libloading" },           # Old version used by ash (vulkan binding), newer version used by khronos-egl
+  { name = "windows" },              # Old version used by accesskit_windows, newer version used by wgpu
 ]
 skip-tree = [
   { name = "cargo-run-wasm" }, # Dev-tool