Make get_device_limits to respect the level height

kvark · Oct 23, 2024 · 552a571 · 552a571
1 parent 74e61d5
commit 552a571
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/bin/boilerplate.rs b/bin/boilerplate.rs
@@ -83,7 +83,9 @@ impl Harness {
             .expect("Unable to initialize GPU via the selected backend.");
 
         let downlevel_caps = adapter.get_downlevel_capabilities();
-        let limits = settings.render.get_device_limits(&adapter.limits());
+        let limits = settings
+            .render
+            .get_device_limits(&adapter.limits(), settings.game.geometry.height);
 
         let (device, queue) = task_pool
             .run_until(adapter.request_device(

diff --git a/lib/ffi/src/lib.rs b/lib/ffi/src/lib.rs
@@ -220,7 +220,7 @@ pub extern "C" fn rv_init(desc: InitDescriptor) -> Option<ptr::NonNull<Context>>
         android_logger::Config::default().with_min_level(log::Level::Warn),
     );
 
-    let geometry_config = {
+    let geometry_config: vangers::config::settings::Geometry = {
         let file = File::open("res/ffi/geometry.ron").unwrap();
         ron::de::from_reader(file).unwrap()
     };
@@ -257,7 +257,7 @@ pub extern "C" fn rv_init(desc: InitDescriptor) -> Option<ptr::NonNull<Context>>
         ..Default::default()
     });
     let adapter = unsafe { instance.create_adapter_from_hal(exposed) };
-    let limits = render_config.get_device_limits(&adapter.limits());
+    let limits = render_config.get_device_limits(&adapter.limits(), geometry_config.height);
 
     let (device, queue) = task_pool
         .run_until(adapter.request_device(

diff --git a/src/config/settings.rs b/src/config/settings.rs
@@ -174,8 +174,8 @@ pub struct Render {
 }
 
 impl Render {
-    pub fn get_device_limits(&self, adapter_limits: &wgpu::Limits) -> wgpu::Limits {
-        let terrain_buffer_size = 1 << 26; // 2048 (X) * 16384 (Y) * 2 (height+meta)
+    pub fn get_device_limits(&self, adapter_limits: &wgpu::Limits, slices: u32) -> wgpu::Limits {
+        let (max_width, max_height) = (2048usize, 16384usize);
         match self.terrain {
             Terrain::RayTraced { .. } | Terrain::Sliced { .. } | Terrain::Painted { .. } => {
                 wgpu::Limits {
@@ -184,16 +184,19 @@ impl Render {
                 }
             }
             Terrain::RayVoxelTraced { voxel_size, .. } => {
-                let max_3d_points = (terrain_buffer_size as usize / 2) * 256;
                 let voxel_points = voxel_size[0] * voxel_size[1] * voxel_size[2];
-                // Note: 5/32 is roughly the number of bytes per voxel if we include the LOD chain
-                let voxel_storage_size = (max_3d_points / voxel_points as usize * 5) / 32;
+                let max_voxels = max_width * max_height * slices as usize / voxel_points as usize;
+                // Note: 1/7 is roughly the sum size of all the mips
+                // Division by 8 is because we have 8 bits per byte.
+                // The extra space is for rounding and such.
+                let voxel_storage_size = (max_voxels * 8 / 7) / 8 + 4096;
                 info!(
                     "Estimating {} MB for voxel storage",
                     voxel_storage_size >> 20
                 );
                 wgpu::Limits {
                     max_storage_buffer_binding_size: voxel_storage_size as u32,
+                    max_texture_dimension_2d: max_width.max(max_height) as u32,
                     ..wgpu::Limits::downlevel_defaults()
                 }
             }