Skip to content

Commit da77a43

Browse files
kvarkjimblandy
authored andcommitted
Update naga capabilities for TLAS array
1 parent adc3534 commit da77a43

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

naga/src/back/hlsl/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -770,6 +770,7 @@ pub fn supported_capabilities() -> crate::valid::Capabilities {
770770
// No BUFFER_BINDING_ARRAY
771771
| Caps::STORAGE_TEXTURE_BINDING_ARRAY
772772
// No STORAGE_BUFFER_BINDING_ARRAY
773+
| Caps::ACCELERATION_STRUCTURE_BINDING_ARRAY
773774
// No CLIP_DISTANCE
774775
// No CULL_DISTANCE
775776
| Caps::STORAGE_TEXTURE_16BIT_NORM_FORMATS

naga/src/back/spv/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,6 +1157,7 @@ pub fn supported_capabilities() -> crate::valid::Capabilities {
11571157
| Caps::BUFFER_BINDING_ARRAY
11581158
| Caps::STORAGE_TEXTURE_BINDING_ARRAY
11591159
| Caps::STORAGE_BUFFER_BINDING_ARRAY
1160+
| Caps::ACCELERATION_STRUCTURE_BINDING_ARRAY
11601161
| Caps::CLIP_DISTANCE
11611162
// No cull distance
11621163
| Caps::STORAGE_TEXTURE_16BIT_NORM_FORMATS

tests/tests/wgpu-gpu/binding_array/tlas.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::{borrow::Cow, num::NonZeroU32};
33
use wgpu::util::DeviceExt;
44
use wgpu::*;
55
use wgpu_test::{
6-
gpu_test, FailureCase, GpuTestConfiguration, GpuTestInitializer, TestParameters, TestingContext,
6+
gpu_test, GpuTestConfiguration, GpuTestInitializer, TestParameters, TestingContext,
77
};
88

99
pub fn all_tests(tests: &mut Vec<GpuTestInitializer>) {
@@ -24,9 +24,7 @@ static BINDING_ARRAY_TLAS: GpuTestConfiguration = GpuTestConfiguration::new()
2424
max_acceleration_structures_per_shader_stage: 8,
2525
max_binding_array_acceleration_structure_elements_per_shader_stage: 8,
2626
..Limits::default().using_minimum_supported_acceleration_structure_values()
27-
})
28-
// As of writing, Metal's HAL does not implement binding acceleration structures.
29-
.skip(FailureCase::backend(Backends::METAL)),
27+
}),
3028
)
3129
.run_async(|ctx| async move { binding_array_tlas(ctx).await });
3230

0 commit comments

Comments
 (0)