Skip to content

Commit 21de7f7

Browse files
Vecveccwfitzgerald
Vecvec
and
cwfitzgerald
authored
Support DXR in wgpu-hal & naga. (#6777)
Co-authored-by: Connor Fitzgerald <[email protected]>
1 parent 2cfea40 commit 21de7f7

File tree

20 files changed

+1008
-60
lines changed

20 files changed

+1008
-60
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,10 @@ By @wumpf in [#6849](https://github.com/gfx-rs/wgpu/pull/6849).
177177
- Add build support for Apple Vision Pro. By @guusw in [#6611](https://github.com/gfx-rs/wgpu/pull/6611).
178178
- Add `raw_handle` method to access raw Metal textures in [#6894](https://github.com/gfx-rs/wgpu/pull/6894).
179179

180+
#### D3D12
181+
182+
- Support DXR (DirectX Ray-tracing) in wgpu-hal. By @Vecvec in [#6777](https://github.com/gfx-rs/wgpu/pull/6777)
183+
180184
#### Changes
181185

182186
##### Naga

‎examples/src/ray_cube_compute/mod.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ struct Example {
141141
impl crate::framework::Example for Example {
142142
fn required_features() -> wgpu::Features {
143143
wgpu::Features::TEXTURE_BINDING_ARRAY
144-
| wgpu::Features::STORAGE_RESOURCE_BINDING_ARRAY
145144
| wgpu::Features::VERTEX_WRITABLE_STORAGE
146145
| wgpu::Features::EXPERIMENTAL_RAY_QUERY
147146
| wgpu::Features::EXPERIMENTAL_RAY_TRACING_ACCELERATION_STRUCTURE

‎naga/src/back/hlsl/help.rs‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -841,6 +841,9 @@ impl<W: Write> super::Writer<'_, W> {
841841
&crate::PredeclaredType::AtomicCompareExchangeWeakResult { .. } => {}
842842
}
843843
}
844+
if module.special_types.ray_desc.is_some() {
845+
self.write_ray_desc_from_ray_desc_constructor_function(module)?;
846+
}
844847

845848
Ok(())
846849
}
@@ -852,16 +855,30 @@ impl<W: Write> super::Writer<'_, W> {
852855
expressions: &crate::Arena<crate::Expression>,
853856
) -> BackendResult {
854857
for (handle, _) in expressions.iter() {
855-
if let crate::Expression::Compose { ty, .. } = expressions[handle] {
856-
match module.types[ty].inner {
857-
crate::TypeInner::Struct { .. } | crate::TypeInner::Array { .. } => {
858-
let constructor = WrappedConstructor { ty };
859-
if self.wrapped.constructors.insert(constructor) {
860-
self.write_wrapped_constructor_function(module, constructor)?;
858+
match expressions[handle] {
859+
crate::Expression::Compose { ty, .. } => {
860+
match module.types[ty].inner {
861+
crate::TypeInner::Struct { .. } | crate::TypeInner::Array { .. } => {
862+
let constructor = WrappedConstructor { ty };
863+
if self.wrapped.constructors.insert(constructor) {
864+
self.write_wrapped_constructor_function(module, constructor)?;
865+
}
866+
}
867+
_ => {}
868+
};
869+
}
870+
crate::Expression::RayQueryGetIntersection { committed, .. } => {
871+
if committed {
872+
if !self.written_committed_intersection {
873+
self.write_committed_intersection_function(module)?;
874+
self.written_committed_intersection = true;
861875
}
876+
} else if !self.written_candidate_intersection {
877+
self.write_candidate_intersection_function(module)?;
878+
self.written_candidate_intersection = true;
862879
}
863-
_ => {}
864-
};
880+
}
881+
_ => {}
865882
}
866883
}
867884
Ok(())

‎naga/src/back/hlsl/keywords.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -814,6 +814,7 @@ pub const RESERVED: &[&str] = &[
814814
"TextureBuffer",
815815
"ConstantBuffer",
816816
"RayQuery",
817+
"RayDesc",
817818
// Naga utilities
818819
super::writer::MODF_FUNCTION,
819820
super::writer::FREXP_FUNCTION,

‎naga/src/back/hlsl/mod.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ accessing individual columns by dynamic index.
101101
mod conv;
102102
mod help;
103103
mod keywords;
104+
mod ray;
104105
mod storage;
105106
mod writer;
106107

@@ -331,6 +332,8 @@ pub struct Writer<'a, W> {
331332
/// Set of expressions that have associated temporary variables
332333
named_expressions: crate::NamedExpressions,
333334
wrapped: Wrapped,
335+
written_committed_intersection: bool,
336+
written_candidate_intersection: bool,
334337
continue_ctx: back::continue_forward::ContinueCtx,
335338

336339
/// A reference to some part of a global variable, lowered to a series of

‎naga/src/back/hlsl/ray.rs‎

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
use crate::back::hlsl::BackendResult;
2+
use crate::{RayQueryIntersection, TypeInner};
3+
use std::fmt::Write;
4+
5+
impl<W: Write> super::Writer<'_, W> {
6+
// constructs hlsl RayDesc from wgsl RayDesc
7+
pub(super) fn write_ray_desc_from_ray_desc_constructor_function(
8+
&mut self,
9+
module: &crate::Module,
10+
) -> BackendResult {
11+
write!(self.out, "RayDesc RayDescFromRayDesc_(")?;
12+
self.write_type(module, module.special_types.ray_desc.unwrap())?;
13+
writeln!(self.out, " arg0) {{")?;
14+
writeln!(self.out, " RayDesc ret = (RayDesc)0;")?;
15+
writeln!(self.out, " ret.Origin = arg0.origin;")?;
16+
writeln!(self.out, " ret.TMin = arg0.tmin;")?;
17+
writeln!(self.out, " ret.Direction = arg0.dir;")?;
18+
writeln!(self.out, " ret.TMax = arg0.tmax;")?;
19+
writeln!(self.out, " return ret;")?;
20+
writeln!(self.out, "}}")?;
21+
writeln!(self.out)?;
22+
Ok(())
23+
}
24+
pub(super) fn write_committed_intersection_function(
25+
&mut self,
26+
module: &crate::Module,
27+
) -> BackendResult {
28+
self.write_type(module, module.special_types.ray_intersection.unwrap())?;
29+
write!(self.out, " GetCommittedIntersection(")?;
30+
self.write_value_type(module, &TypeInner::RayQuery)?;
31+
writeln!(self.out, " rq) {{")?;
32+
write!(self.out, " ")?;
33+
self.write_type(module, module.special_types.ray_intersection.unwrap())?;
34+
write!(self.out, " ret = (")?;
35+
self.write_type(module, module.special_types.ray_intersection.unwrap())?;
36+
writeln!(self.out, ")0;")?;
37+
writeln!(self.out, " ret.kind = rq.CommittedStatus();")?;
38+
writeln!(
39+
self.out,
40+
" if( rq.CommittedStatus() == COMMITTED_NOTHING) {{}} else {{"
41+
)?;
42+
writeln!(self.out, " ret.t = rq.CommittedRayT();")?;
43+
writeln!(
44+
self.out,
45+
" ret.instance_custom_index = rq.CommittedInstanceID();"
46+
)?;
47+
writeln!(
48+
self.out,
49+
" ret.instance_id = rq.CommittedInstanceIndex();"
50+
)?;
51+
writeln!(
52+
self.out,
53+
" ret.sbt_record_offset = rq.CommittedInstanceContributionToHitGroupIndex();"
54+
)?;
55+
writeln!(
56+
self.out,
57+
" ret.geometry_index = rq.CommittedGeometryIndex();"
58+
)?;
59+
writeln!(
60+
self.out,
61+
" ret.primitive_index = rq.CommittedPrimitiveIndex();"
62+
)?;
63+
writeln!(
64+
self.out,
65+
" if( rq.CommittedStatus() == COMMITTED_TRIANGLE_HIT ) {{"
66+
)?;
67+
writeln!(
68+
self.out,
69+
" ret.barycentrics = rq.CommittedTriangleBarycentrics();"
70+
)?;
71+
writeln!(
72+
self.out,
73+
" ret.front_face = rq.CommittedTriangleFrontFace();"
74+
)?;
75+
writeln!(self.out, " }}")?;
76+
writeln!(
77+
self.out,
78+
" ret.object_to_world = rq.CommittedObjectToWorld4x3();"
79+
)?;
80+
writeln!(
81+
self.out,
82+
" ret.world_to_object = rq.CommittedWorldToObject4x3();"
83+
)?;
84+
writeln!(self.out, " }}")?;
85+
writeln!(self.out, " return ret;")?;
86+
writeln!(self.out, "}}")?;
87+
writeln!(self.out)?;
88+
Ok(())
89+
}
90+
pub(super) fn write_candidate_intersection_function(
91+
&mut self,
92+
module: &crate::Module,
93+
) -> BackendResult {
94+
self.write_type(module, module.special_types.ray_intersection.unwrap())?;
95+
write!(self.out, " GetCandidateIntersection(")?;
96+
self.write_value_type(module, &TypeInner::RayQuery)?;
97+
writeln!(self.out, " rq) {{")?;
98+
write!(self.out, " ")?;
99+
self.write_type(module, module.special_types.ray_intersection.unwrap())?;
100+
write!(self.out, " ret = (")?;
101+
self.write_type(module, module.special_types.ray_intersection.unwrap())?;
102+
writeln!(self.out, ")0;")?;
103+
writeln!(self.out, " CANDIDATE_TYPE kind = rq.CandidateType();")?;
104+
writeln!(
105+
self.out,
106+
" if (kind == CANDIDATE_NON_OPAQUE_TRIANGLE) {{"
107+
)?;
108+
writeln!(
109+
self.out,
110+
" ret.kind = {};",
111+
RayQueryIntersection::Triangle as u32
112+
)?;
113+
writeln!(self.out, " ret.t = rq.CandidateTriangleRayT();")?;
114+
writeln!(
115+
self.out,
116+
" ret.barycentrics = rq.CandidateTriangleBarycentrics();"
117+
)?;
118+
writeln!(
119+
self.out,
120+
" ret.front_face = rq.CandidateTriangleFrontFace();"
121+
)?;
122+
writeln!(self.out, " }} else {{")?;
123+
writeln!(
124+
self.out,
125+
" ret.kind = {};",
126+
RayQueryIntersection::Aabb as u32
127+
)?;
128+
writeln!(self.out, " }}")?;
129+
130+
writeln!(
131+
self.out,
132+
" ret.instance_custom_index = rq.CandidateInstanceID();"
133+
)?;
134+
writeln!(
135+
self.out,
136+
" ret.instance_id = rq.CandidateInstanceIndex();"
137+
)?;
138+
writeln!(
139+
self.out,
140+
" ret.sbt_record_offset = rq.CandidateInstanceContributionToHitGroupIndex();"
141+
)?;
142+
writeln!(
143+
self.out,
144+
" ret.geometry_index = rq.CandidateGeometryIndex();"
145+
)?;
146+
writeln!(
147+
self.out,
148+
" ret.primitive_index = rq.CandidatePrimitiveIndex();"
149+
)?;
150+
writeln!(
151+
self.out,
152+
" ret.object_to_world = rq.CandidateObjectToWorld4x3();"
153+
)?;
154+
writeln!(
155+
self.out,
156+
" ret.world_to_object = rq.CandidateWorldToObject4x3();"
157+
)?;
158+
writeln!(self.out, " return ret;")?;
159+
writeln!(self.out, "}}")?;
160+
writeln!(self.out)?;
161+
Ok(())
162+
}
163+
}

‎naga/src/back/hlsl/writer.rs‎

Lines changed: 67 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use super::{
99
use crate::{
1010
back::{self, Baked},
1111
proc::{self, index, ExpressionKindTracker, NameKey},
12-
valid, Handle, Module, Scalar, ScalarKind, ShaderStage, TypeInner,
12+
valid, Handle, Module, RayQueryFunction, Scalar, ScalarKind, ShaderStage, TypeInner,
1313
};
1414
use std::{fmt, mem};
1515

@@ -104,6 +104,8 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
104104
entry_point_io: Vec::new(),
105105
named_expressions: crate::NamedExpressions::default(),
106106
wrapped: super::Wrapped::default(),
107+
written_committed_intersection: false,
108+
written_candidate_intersection: false,
107109
continue_ctx: back::continue_forward::ContinueCtx::default(),
108110
temp_access_chain: Vec::new(),
109111
need_bake_expressions: Default::default(),
@@ -123,6 +125,8 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
123125
self.entry_point_io.clear();
124126
self.named_expressions.clear();
125127
self.wrapped.clear();
128+
self.written_committed_intersection = false;
129+
self.written_candidate_intersection = false;
126130
self.continue_ctx.clear();
127131
self.need_bake_expressions.clear();
128132
}
@@ -1218,6 +1222,13 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
12181222
TypeInner::Array { base, size, .. } | TypeInner::BindingArray { base, size } => {
12191223
self.write_array_size(module, base, size)?;
12201224
}
1225+
TypeInner::AccelerationStructure => {
1226+
write!(self.out, "RaytracingAccelerationStructure")?;
1227+
}
1228+
TypeInner::RayQuery => {
1229+
// these are constant flags, there are dynamic flags also but constant flags are not supported by naga
1230+
write!(self.out, "RayQuery<RAY_FLAG_NONE>")?;
1231+
}
12211232
_ => return Err(Error::Unimplemented(format!("write_value_type {inner:?}"))),
12221233
}
12231234

@@ -1375,15 +1386,20 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
13751386
self.write_array_size(module, base, size)?;
13761387
}
13771388

1378-
write!(self.out, " = ")?;
1379-
// Write the local initializer if needed
1380-
if let Some(init) = local.init {
1381-
self.write_expr(module, init, func_ctx)?;
1382-
} else {
1383-
// Zero initialize local variables
1384-
self.write_default_init(module, local.ty)?;
1389+
match module.types[local.ty].inner {
1390+
// from https://microsoft.github.io/DirectX-Specs/d3d/Raytracing.html#tracerayinline-example-1 it seems that ray queries shouldn't be zeroed
1391+
TypeInner::RayQuery => {}
1392+
_ => {
1393+
write!(self.out, " = ")?;
1394+
// Write the local initializer if needed
1395+
if let Some(init) = local.init {
1396+
self.write_expr(module, init, func_ctx)?;
1397+
} else {
1398+
// Zero initialize local variables
1399+
self.write_default_init(module, local.ty)?;
1400+
}
1401+
}
13851402
}
1386-
13871403
// Finish the local with `;` and add a newline (only for readability)
13881404
writeln!(self.out, ";")?
13891405
}
@@ -2250,7 +2266,37 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
22502266
} => {
22512267
self.write_switch(module, func_ctx, level, selector, cases)?;
22522268
}
2253-
Statement::RayQuery { .. } => unreachable!(),
2269+
Statement::RayQuery { query, ref fun } => match *fun {
2270+
RayQueryFunction::Initialize {
2271+
acceleration_structure,
2272+
descriptor,
2273+
} => {
2274+
write!(self.out, "{level}")?;
2275+
self.write_expr(module, query, func_ctx)?;
2276+
write!(self.out, ".TraceRayInline(")?;
2277+
self.write_expr(module, acceleration_structure, func_ctx)?;
2278+
write!(self.out, ", ")?;
2279+
self.write_expr(module, descriptor, func_ctx)?;
2280+
write!(self.out, ".flags, ")?;
2281+
self.write_expr(module, descriptor, func_ctx)?;
2282+
write!(self.out, ".cull_mask, ")?;
2283+
write!(self.out, "RayDescFromRayDesc_(")?;
2284+
self.write_expr(module, descriptor, func_ctx)?;
2285+
writeln!(self.out, "));")?;
2286+
}
2287+
RayQueryFunction::Proceed { result } => {
2288+
write!(self.out, "{level}")?;
2289+
let name = Baked(result).to_string();
2290+
write!(self.out, "const bool {name} = ")?;
2291+
self.named_expressions.insert(result, name);
2292+
self.write_expr(module, query, func_ctx)?;
2293+
writeln!(self.out, ".Proceed();")?;
2294+
}
2295+
RayQueryFunction::Terminate => {
2296+
self.write_expr(module, query, func_ctx)?;
2297+
writeln!(self.out, ".Abort();")?;
2298+
}
2299+
},
22542300
Statement::SubgroupBallot { result, predicate } => {
22552301
write!(self.out, "{level}")?;
22562302
let name = Baked(result).to_string();
@@ -3608,8 +3654,17 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
36083654
self.write_expr(module, reject, func_ctx)?;
36093655
write!(self.out, ")")?
36103656
}
3611-
// Not supported yet
3612-
Expression::RayQueryGetIntersection { .. } => unreachable!(),
3657+
Expression::RayQueryGetIntersection { query, committed } => {
3658+
if committed {
3659+
write!(self.out, "GetCommittedIntersection(")?;
3660+
self.write_expr(module, query, func_ctx)?;
3661+
write!(self.out, ")")?;
3662+
} else {
3663+
write!(self.out, "GetCandidateIntersection(")?;
3664+
self.write_expr(module, query, func_ctx)?;
3665+
write!(self.out, ")")?;
3666+
}
3667+
}
36133668
// Nothing to do here, since call expression already cached
36143669
Expression::CallResult(_)
36153670
| Expression::AtomicResult { .. }

‎naga/tests/in/ray-query.param.ron‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,11 @@
1111
per_entry_point_map: {},
1212
inline_samplers: [],
1313
),
14+
hlsl: (
15+
shader_model: V6_5,
16+
binding_map: {},
17+
fake_missing_bindings: true,
18+
special_constants_binding: None,
19+
zero_initialize_workgroup_memory: true,
20+
)
1421
)

0 commit comments

Comments
 (0)