when creating and building acceleration structures require Features::…

…RAY_TRACING_ACCELERATION_STRUCTURE is enabled
gfx-rs · Sep 20, 2024 · e2168e6 · e2168e6
1 parent cb167a4
commit e2168e6
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/wgpu-core/src/command/ray_tracing.rs b/wgpu-core/src/command/ray_tracing.rs
@@ -13,7 +13,7 @@ use crate::{
     FastHashSet,
 };
 
-use wgt::{math::align_to, BufferAddress, BufferUsages};
+use wgt::{math::align_to, BufferAddress, BufferUsages, Features};
 
 use super::{BakedCommands, CommandBufferMutable};
 use crate::ray_tracing::BlasTriangleGeometry;
@@ -67,6 +67,13 @@ impl Global {
 
         let device = &cmd_buf.device;
 
+        if !device
+            .features
+            .contains(Features::RAY_TRACING_ACCELERATION_STRUCTURE)
+        {
+            return Err(BuildAccelerationStructureError::MissingFeature);
+        }
+
         let build_command_index = NonZeroU64::new(
             device
                 .last_acceleration_structure_build_command_index
@@ -343,6 +350,13 @@ impl Global {
 
         let device = &cmd_buf.device;
 
+        if !device
+            .features
+            .contains(Features::RAY_TRACING_ACCELERATION_STRUCTURE)
+        {
+            return Err(BuildAccelerationStructureError::MissingFeature);
+        }
+
         let build_command_index = NonZeroU64::new(
             device
                 .last_acceleration_structure_build_command_index

diff --git a/wgpu-core/src/device/ray_tracing.rs b/wgpu-core/src/device/ray_tracing.rs
@@ -1,8 +1,6 @@
 use std::mem::ManuallyDrop;
 use std::sync::Arc;
 
-use hal::AccelerationStructureTriangleIndices;
-
 #[cfg(feature = "trace")]
 use crate::device::trace;
 use crate::lock::rank;
@@ -15,6 +13,8 @@ use crate::{
     ray_tracing::{get_raw_tlas_instance_size, CreateBlasError, CreateTlasError},
     resource, LabelHelpers,
 };
+use hal::AccelerationStructureTriangleIndices;
+use wgt::Features;
 
 impl Device {
     fn create_blas(
@@ -182,6 +182,13 @@ impl Global {
                 Err(err) => break 'error CreateBlasError::Device(err),
             };
 
+            if !device
+                .features
+                .contains(Features::RAY_TRACING_ACCELERATION_STRUCTURE)
+            {
+                break 'error CreateBlasError::MissingFeature;
+            }
+
             #[cfg(feature = "trace")]
             if let Some(trace) = device.trace.lock().as_mut() {
                 trace.add(trace::Action::CreateBlas {
@@ -225,6 +232,14 @@ impl Global {
                 Ok(_) => {}
                 Err(e) => break 'error CreateTlasError::Device(e),
             }
+
+            if !device
+                .features
+                .contains(Features::RAY_TRACING_ACCELERATION_STRUCTURE)
+            {
+                break 'error CreateTlasError::MissingFeature;
+            }
+
             #[cfg(feature = "trace")]
             if let Some(trace) = device.trace.lock().as_mut() {
                 trace.add(trace::Action::CreateTlas {

diff --git a/wgpu-core/src/ray_tracing.rs b/wgpu-core/src/ray_tracing.rs
@@ -31,6 +31,8 @@ pub enum CreateBlasError {
     MissingIndexData,
     #[error("Provided format was not within allowed formats. Provided format: {0:?}. Allowed formats: {1:?}")]
     InvalidVertexFormat(VertexFormat, Vec<VertexFormat>),
+    #[error("Features::RAY_TRACING_ACCELERATION_STRUCTURE is not enabled")]
+    MissingFeature,
 }
 
 #[derive(Clone, Debug, Error)]
@@ -39,6 +41,8 @@ pub enum CreateTlasError {
     Device(#[from] DeviceError),
     #[error(transparent)]
     CreateBufferError(#[from] CreateBufferError),
+    #[error("Features::RAY_TRACING_ACCELERATION_STRUCTURE is not enabled")]
+    MissingFeature,
     #[error("Unimplemented Tlas error: this error is not yet implemented")]
     Unimplemented,
 }
@@ -136,6 +140,9 @@ pub enum BuildAccelerationStructureError {
     #[error("Tlas {0:?} is invalid or destroyed")]
     InvalidTlas(ResourceErrorIdent),
 
+    #[error("Features::RAY_TRACING_ACCELERATION_STRUCTURE is not enabled")]
+    MissingFeature,
+
     #[error("Buffer {0:?} is missing `TLAS_INPUT` usage flag")]
     MissingTlasInputUsageFlag(ResourceErrorIdent),
 }