diff --git a/Cargo.lock b/Cargo.lock index 1235c2f..101b743 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -536,7 +536,8 @@ dependencies = [ [[package]] name = "egui_wgpu_backend" version = "0.25.0" -source = "git+https://github.com/kvark/egui_wgpu_backend?branch=wgpu-0.17#da5c92aa2aa4890aa0f115fbb9cf71c62e545924" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af9e07cadafcbc676fd393d4c5188fc7d34fa8fe90e6632310f9bff1986704d2" dependencies = [ "bytemuck", "egui", diff --git a/Cargo.toml b/Cargo.toml index 380514e..f04f308 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,8 +71,7 @@ winit = "0.28" # gui egui = "0.22" egui_winit_platform = "0.19" -#egui_wgpu_backend = "0.24" -egui_wgpu_backend = { git = "https://github.com/kvark/egui_wgpu_backend", branch = "wgpu-0.17" } +egui_wgpu_backend = "0.25" [dev-dependencies] naga = { version = "0.13", features = ["wgsl-in", "validate"] } @@ -81,7 +80,7 @@ naga = { version = "0.13", features = ["wgsl-in", "validate"] } version = "1.0.1" default-features = false -[patch."https://github.com/gfx-rs/wgpu"] +[patch.crates-io] #wgpu = { path = "../wgpu/wgpu" } #wgpu-hal = { path = "../wgpu/wgpu-hal" } #wgpu-core = { path = "../wgpu/wgpu-core" } diff --git a/bin/boilerplate.rs b/bin/boilerplate.rs index 8b698a9..9c90273 100644 --- a/bin/boilerplate.rs +++ b/bin/boilerplate.rs @@ -105,9 +105,8 @@ impl Harness { voxel_storage_size >> 20 ); wgpu::Limits { - max_storage_buffer_binding_size: terrain_buffer_size - .max(voxel_storage_size as u32), - ..wgpu::Limits::default() + max_storage_buffer_binding_size: voxel_storage_size as u32, + ..wgpu::Limits::downlevel_defaults() } } Terrain::Scattered { .. } => wgpu::Limits::default(),