Add to CHANGELOG.md and fix formatting errors.

gfx-rs · Sep 1, 2023 · 528bffe · 528bffe
1 parent 2b06746
commit 528bffe
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -107,6 +107,10 @@ By @Valaphee in [#3402](https://github.com/gfx-rs/wgpu/pull/3402)
 
 - Ensure that MTLCommandEncoder calls endEncoding before it is deallocated. By @bradwerth in [#4023](https://github.com/gfx-rs/wgpu/pull/4023)
 
+#### WebGPU
+
+- Ensure that limit requests and reporting is done correctly. By @OptimisticPeach in [#4107](https://github.com/gfx-rs/wgpu/pull/4107)
+
 ### Documentation
 
 - Add an overview of `RenderPass` and how render state works. By @kpreid in [#4055](https://github.com/gfx-rs/wgpu/pull/4055)

diff --git a/wgpu/src/backend/web.rs b/wgpu/src/backend/web.rs
@@ -1015,7 +1015,6 @@ impl crate::context::Context for Context {
         }
 
         let mut mapped_desc = web_sys::GpuDeviceDescriptor::new();
-        log::info!("descriptor given: {:#?}", desc.limits);
 
         // TODO: Migrate to a web_sys api.
         // See https://github.com/rustwasm/wasm-bindgen/issues/3587
@@ -1071,7 +1070,12 @@ impl crate::context::Context for Context {
             object
         };
 
-        js_sys::Reflect::set(&mapped_desc, &JsValue::from("requiredLimits"), &limits_object).expect("Setting Object properties should never fail.");
+        js_sys::Reflect::set(
+            &mapped_desc,
+            &JsValue::from("requiredLimits"),
+            &limits_object,
+        )
+        .expect("Setting Object properties should never fail.");
 
         let required_features = FEATURES_MAPPING
             .iter()
@@ -1158,12 +1162,11 @@ impl crate::context::Context for Context {
             max_compute_workgroup_size_y: limits.max_compute_workgroup_size_y(),
             max_compute_workgroup_size_z: limits.max_compute_workgroup_size_z(),
             max_compute_workgroups_per_dimension: limits.max_compute_workgroups_per_dimension(),
-            ..wgt::Limits::default()
-            // The following are not part of WebGPU
             /*
               max_push_constant_size: limits.max_push_constant_size(),
               max_non_sampler_bindings: limits.max_non_sampler_bindings(),
             */
+            ..wgt::Limits::default() // The following are not part of WebGPU
         }
     }
 
@@ -1361,12 +1364,11 @@ impl crate::context::Context for Context {
             max_compute_workgroup_size_y: limits.max_compute_workgroup_size_y(),
             max_compute_workgroup_size_z: limits.max_compute_workgroup_size_z(),
             max_compute_workgroups_per_dimension: limits.max_compute_workgroups_per_dimension(),
-            ..wgt::Limits::default()
-            // The following are not part of WebGPU
             /*
               max_push_constant_size: limits.max_push_constant_size(),
               max_non_sampler_bindings: limits.max_non_sampler_bindings(),
             */
+            ..wgt::Limits::default() // The following are not part of WebGPU
         }
     }