Switch egui backend to crates, adjust the limits

kvark · kvark · commit f33276bbb274 · 2023-07-26T21:33:41.000-07:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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(),

Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,8 @@ impl Harness {`
`105`	`105`	`voxel_storage_size >> 20`
`106`	`106`	`);`
`107`	`107`	`wgpu::Limits {`
`108`		`- max_storage_buffer_binding_size: terrain_buffer_size`
`109`		`- .max(voxel_storage_size as u32),`
`110`		`- ..wgpu::Limits::default()`
	`108`	`+ max_storage_buffer_binding_size: voxel_storage_size as u32,`
	`109`	`+ ..wgpu::Limits::downlevel_defaults()`
`111`	`110`	`}`
`112`	`111`	`}`
`113`	`112`	`Terrain::Scattered { .. } => wgpu::Limits::default(),`