nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-22 06:44:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wgpu] remove trace feature temporarily (#5975)

Browse Source
This commit is contained in:
Teodor Tanasoaia 2024-07-17 20:10:49 +02:00 committed by GitHub
parent 91924fb603
commit 69a1134e02
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -185,6 +185,7 @@ By @teoxoy in [#5901](https://github.com/gfx-rs/wgpu/pull/5901)
- Avoid introducing spurious features for optional dependencies. By @bjorn3 in [#5691](https://github.com/gfx-rs/wgpu/pull/5691) - Avoid introducing spurious features for optional dependencies. By @bjorn3 in [#5691](https://github.com/gfx-rs/wgpu/pull/5691)
- `wgpu::Error` is now `Sync`, making it possible to be wrapped in `anyhow::Error` or `eyre::Report`. By @nolanderc in [#5820](https://github.com/gfx-rs/wgpu/pull/5820) - `wgpu::Error` is now `Sync`, making it possible to be wrapped in `anyhow::Error` or `eyre::Report`. By @nolanderc in [#5820](https://github.com/gfx-rs/wgpu/pull/5820)
- Added benchmark suite. By @cwfitzgerald in [#5694](https://github.com/gfx-rs/wgpu/pull/5694), compute passes by @wumpf in [#5767](https://github.com/gfx-rs/wgpu/pull/5767) - Added benchmark suite. By @cwfitzgerald in [#5694](https://github.com/gfx-rs/wgpu/pull/5694), compute passes by @wumpf in [#5767](https://github.com/gfx-rs/wgpu/pull/5767)
- The `trace` wgpu feature has been temporarily removed. By @teoxoy in [#5975](https://github.com/gfx-rs/wgpu/pull/5975)
#### Metal #### Metal
- Removed the `link` Cargo feature. - Removed the `link` Cargo feature.

5
wgpu/Cargo.toml
View File

@ -87,8 +87,9 @@ strict_asserts = ["wgc?/strict_asserts", "wgt/strict_asserts"]
## Enables serialization via `serde` on common wgpu types. ## Enables serialization via `serde` on common wgpu types.
serde = ["dep:serde", "wgc/serde"] serde = ["dep:serde", "wgc/serde"]
## Allow writing of trace capture files. See [`Adapter::request_device`]. # Uncomment once we get to https://github.com/gfx-rs/wgpu/issues/5974
trace = ["serde", "wgc/trace"] # ## Allow writing of trace capture files. See [`Adapter::request_device`].
# trace = ["serde", "wgc/trace"]
## Allow deserializing of trace capture files that were written with the `trace` feature. ## Allow deserializing of trace capture files that were written with the `trace` feature.
## To replay a trace file use the [wgpu player](https://github.com/gfx-rs/wgpu/tree/trunk/player). ## To replay a trace file use the [wgpu player](https://github.com/gfx-rs/wgpu/tree/trunk/player).

10
wgpu/src/backend/wgpu_core.rs
View File

@ -105,12 +105,15 @@ impl ContextWgpuCore {
desc: &crate::DeviceDescriptor<'_>, desc: &crate::DeviceDescriptor<'_>,
trace_dir: Option<&std::path::Path>, trace_dir: Option<&std::path::Path>,
) -> Result<(Device, Queue), crate::RequestDeviceError> { ) -> Result<(Device, Queue), crate::RequestDeviceError> {
if trace_dir.is_some() {
log::error!("Feature 'trace' has been removed temporarily, see https://github.com/gfx-rs/wgpu/issues/5974");
}
let (device_id, queue_id, error) = unsafe { let (device_id, queue_id, error) = unsafe {
self.0.create_device_from_hal( self.0.create_device_from_hal(
*adapter, *adapter,
hal_device, hal_device,
&desc.map_label(|l| l.map(Borrowed)), &desc.map_label(|l| l.map(Borrowed)),
trace_dir, None,
None, None,
None, None,
) )
@ -640,10 +643,13 @@ impl crate::Context for ContextWgpuCore {
desc: &crate::DeviceDescriptor<'_>, desc: &crate::DeviceDescriptor<'_>,
trace_dir: Option<&std::path::Path>, trace_dir: Option<&std::path::Path>,
) -> Self::RequestDeviceFuture { ) -> Self::RequestDeviceFuture {
if trace_dir.is_some() {
log::error!("Feature 'trace' has been removed temporarily, see https://github.com/gfx-rs/wgpu/issues/5974");
}
let (device_id, queue_id, error) = wgc::gfx_select!(*adapter => self.0.adapter_request_device( let (device_id, queue_id, error) = wgc::gfx_select!(*adapter => self.0.adapter_request_device(
*adapter, *adapter,
&desc.map_label(|l| l.map(Borrowed)), &desc.map_label(|l| l.map(Borrowed)),
trace_dir, None,
None, None,
None None
)); ));