Skip to content

Commit 528bffe

Browse files
Add to CHANGELOG.md and fix formatting errors.
1 parent 2b06746 commit 528bffe

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

.cargo/config.toml

Lines changed: 0 additions & 7 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ By @Valaphee in [#3402](https://github.com/gfx-rs/wgpu/pull/3402)
107107

108108
- Ensure that MTLCommandEncoder calls endEncoding before it is deallocated. By @bradwerth in [#4023](https://github.com/gfx-rs/wgpu/pull/4023)
109109

110+
#### WebGPU
111+
112+
- Ensure that limit requests and reporting is done correctly. By @OptimisticPeach in [#4107](https://github.com/gfx-rs/wgpu/pull/4107)
113+
110114
### Documentation
111115

112116
- Add an overview of `RenderPass` and how render state works. By @kpreid in [#4055](https://github.com/gfx-rs/wgpu/pull/4055)

wgpu/src/backend/web.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,6 @@ impl crate::context::Context for Context {
10151015
}
10161016

10171017
let mut mapped_desc = web_sys::GpuDeviceDescriptor::new();
1018-
log::info!("descriptor given: {:#?}", desc.limits);
10191018

10201019
// TODO: Migrate to a web_sys api.
10211020
// See https://github.com/rustwasm/wasm-bindgen/issues/3587
@@ -1071,7 +1070,12 @@ impl crate::context::Context for Context {
10711070
object
10721071
};
10731072

1074-
js_sys::Reflect::set(&mapped_desc, &JsValue::from("requiredLimits"), &limits_object).expect("Setting Object properties should never fail.");
1073+
js_sys::Reflect::set(
1074+
&mapped_desc,
1075+
&JsValue::from("requiredLimits"),
1076+
&limits_object,
1077+
)
1078+
.expect("Setting Object properties should never fail.");
10751079

10761080
let required_features = FEATURES_MAPPING
10771081
.iter()
@@ -1158,12 +1162,11 @@ impl crate::context::Context for Context {
11581162
max_compute_workgroup_size_y: limits.max_compute_workgroup_size_y(),
11591163
max_compute_workgroup_size_z: limits.max_compute_workgroup_size_z(),
11601164
max_compute_workgroups_per_dimension: limits.max_compute_workgroups_per_dimension(),
1161-
..wgt::Limits::default()
1162-
// The following are not part of WebGPU
11631165
/*
11641166
max_push_constant_size: limits.max_push_constant_size(),
11651167
max_non_sampler_bindings: limits.max_non_sampler_bindings(),
11661168
*/
1169+
..wgt::Limits::default() // The following are not part of WebGPU
11671170
}
11681171
}
11691172

@@ -1361,12 +1364,11 @@ impl crate::context::Context for Context {
13611364
max_compute_workgroup_size_y: limits.max_compute_workgroup_size_y(),
13621365
max_compute_workgroup_size_z: limits.max_compute_workgroup_size_z(),
13631366
max_compute_workgroups_per_dimension: limits.max_compute_workgroups_per_dimension(),
1364-
..wgt::Limits::default()
1365-
// The following are not part of WebGPU
13661367
/*
13671368
max_push_constant_size: limits.max_push_constant_size(),
13681369
max_non_sampler_bindings: limits.max_non_sampler_bindings(),
13691370
*/
1371+
..wgt::Limits::default() // The following are not part of WebGPU
13701372
}
13711373
}
13721374

0 commit comments

Comments
 (0)