archive-gh-me/wgpu
1
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-12-08 21:26:17 +00:00
Code Issues Projects Releases Wiki Activity

Make the compacted hal acceleration structure inherit a label from the base BLAS. #8103

Browse Source
This commit is contained in:
Vecvec 2025-08-24 21:11:13 +12:00 committed by GitHub
parent 7394d4351b
commit c4a834e4f9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -98,6 +98,7 @@ This allows using precompiled shaders without manually checking which backend's
- The function you pass to `Device::on_uncaptured_error()` must now implement `Sync` in addition to `Send`, and be wrapped in `Arc` instead of `Box`. - The function you pass to `Device::on_uncaptured_error()` must now implement `Sync` in addition to `Send`, and be wrapped in `Arc` instead of `Box`.
In exchange for this, it is no longer possible for calling `wgpu` functions while in that callback to cause a deadlock (not that we encourage you to actually do that). In exchange for this, it is no longer possible for calling `wgpu` functions while in that callback to cause a deadlock (not that we encourage you to actually do that).
By @kpreid in [#8011](https://github.com/gfx-rs/wgpu/pull/8011). By @kpreid in [#8011](https://github.com/gfx-rs/wgpu/pull/8011).
- Make a compacted hal acceleration structure inherit a label from the base BLAS. By @Vecvec in [#8103](https://github.com/gfx-rs/wgpu/pull/8103).
- The limits requested for a device must now satisfy `min_subgroup_size <= max_subgroup_size`. By @andyleiserson in [#8085](https://github.com/gfx-rs/wgpu/pull/8085). - The limits requested for a device must now satisfy `min_subgroup_size <= max_subgroup_size`. By @andyleiserson in [#8085](https://github.com/gfx-rs/wgpu/pull/8085).
#### Naga #### Naga

6
wgpu-core/src/device/queue.rs
View File

@ -1465,6 +1465,8 @@ impl Queue {
profiling::scope!("Queue::compact_blas"); profiling::scope!("Queue::compact_blas");
api_log!("Queue::compact_blas"); api_log!("Queue::compact_blas");
let new_label = blas.label.clone() + " (compacted)";
self.device.check_is_valid()?; self.device.check_is_valid()?;
self.same_device_as(blas.as_ref())?; self.same_device_as(blas.as_ref())?;
@ -1486,7 +1488,7 @@ impl Queue {
device device
.raw() .raw()
.create_acceleration_structure(&hal::AccelerationStructureDescriptor { .create_acceleration_structure(&hal::AccelerationStructureDescriptor {
label: None, label: hal_label(Some(&new_label), device.instance_flags),
size: size_info.acceleration_structure_size, size: size_info.acceleration_structure_size,
format: hal::AccelerationStructureFormat::BottomLevel, format: hal::AccelerationStructureFormat::BottomLevel,
allow_compaction: false, allow_compaction: false,
@ -1528,7 +1530,7 @@ impl Queue {
// Bypass the submit checks which update this because we don't submit this normally. // Bypass the submit checks which update this because we don't submit this normally.
built_index: RwLock::new(rank::BLAS_BUILT_INDEX, Some(built_index)), built_index: RwLock::new(rank::BLAS_BUILT_INDEX, Some(built_index)),
handle, handle,
label: blas.label.clone() + " compacted", label: new_label,
tracking_data: TrackingData::new(blas.device.tracker_indices.blas_s.clone()), tracking_data: TrackingData::new(blas.device.tracker_indices.blas_s.clone()),
compaction_buffer: None, compaction_buffer: None,
compacted_state: Mutex::new(rank::BLAS_COMPACTION_STATE, BlasCompactState::Compacted), compacted_state: Mutex::new(rank::BLAS_COMPACTION_STATE, BlasCompactState::Compacted),