Skip to content

Commit

Permalink
Format.
Browse files Browse the repository at this point in the history
  • Loading branch information
Vecvec committed Feb 9, 2025
1 parent b8bb8e3 commit d399990
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
1 change: 0 additions & 1 deletion tests/tests/ray_tracing/as_build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,6 @@ fn only_tlas_vertex_return(ctx: TestingContext) {
label: Some("TLAS 1"),
});


fail(
&ctx.device,
|| {
Expand Down
15 changes: 13 additions & 2 deletions wgpu-core/src/command/ray_tracing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -530,8 +530,19 @@ impl Global {
},
));

if tlas.flags.contains(wgpu_types::AccelerationStructureFlags::ALLOW_RAY_HIT_VERTEX_RETURN) && !blas.flags.contains(wgpu_types::AccelerationStructureFlags::ALLOW_RAY_HIT_VERTEX_RETURN) {
return Err(BuildAccelerationStructureError::TlasDependentMissingVertexReturn(tlas.error_ident(), blas.error_ident()))
if tlas
.flags
.contains(wgpu_types::AccelerationStructureFlags::ALLOW_RAY_HIT_VERTEX_RETURN)
&& !blas.flags.contains(
wgpu_types::AccelerationStructureFlags::ALLOW_RAY_HIT_VERTEX_RETURN,
)
{
return Err(
BuildAccelerationStructureError::TlasDependentMissingVertexReturn(
tlas.error_ident(),
blas.error_ident(),
),
);
}

instance_count += 1;
Expand Down

0 comments on commit d399990

Please sign in to comment.