-
Notifications
You must be signed in to change notification settings - Fork 999
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support DXR in wgpu-hal & naga. (#6777)
Co-authored-by: Connor Fitzgerald <[email protected]>
- Loading branch information
1 parent
2cfea40
commit 21de7f7
Showing
20 changed files
with
1,008 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| use crate::back::hlsl::BackendResult; | ||
| use crate::{RayQueryIntersection, TypeInner}; | ||
| use std::fmt::Write; | ||
|
|
||
| impl<W: Write> super::Writer<'_, W> { | ||
| // constructs hlsl RayDesc from wgsl RayDesc | ||
| pub(super) fn write_ray_desc_from_ray_desc_constructor_function( | ||
| &mut self, | ||
| module: &crate::Module, | ||
| ) -> BackendResult { | ||
| write!(self.out, "RayDesc RayDescFromRayDesc_(")?; | ||
| self.write_type(module, module.special_types.ray_desc.unwrap())?; | ||
| writeln!(self.out, " arg0) {{")?; | ||
| writeln!(self.out, " RayDesc ret = (RayDesc)0;")?; | ||
| writeln!(self.out, " ret.Origin = arg0.origin;")?; | ||
| writeln!(self.out, " ret.TMin = arg0.tmin;")?; | ||
| writeln!(self.out, " ret.Direction = arg0.dir;")?; | ||
| writeln!(self.out, " ret.TMax = arg0.tmax;")?; | ||
| writeln!(self.out, " return ret;")?; | ||
| writeln!(self.out, "}}")?; | ||
| writeln!(self.out)?; | ||
| Ok(()) | ||
| } | ||
| pub(super) fn write_committed_intersection_function( | ||
| &mut self, | ||
| module: &crate::Module, | ||
| ) -> BackendResult { | ||
| self.write_type(module, module.special_types.ray_intersection.unwrap())?; | ||
| write!(self.out, " GetCommittedIntersection(")?; | ||
| self.write_value_type(module, &TypeInner::RayQuery)?; | ||
| writeln!(self.out, " rq) {{")?; | ||
| write!(self.out, " ")?; | ||
| self.write_type(module, module.special_types.ray_intersection.unwrap())?; | ||
| write!(self.out, " ret = (")?; | ||
| self.write_type(module, module.special_types.ray_intersection.unwrap())?; | ||
| writeln!(self.out, ")0;")?; | ||
| writeln!(self.out, " ret.kind = rq.CommittedStatus();")?; | ||
| writeln!( | ||
| self.out, | ||
| " if( rq.CommittedStatus() == COMMITTED_NOTHING) {{}} else {{" | ||
| )?; | ||
| writeln!(self.out, " ret.t = rq.CommittedRayT();")?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.instance_custom_index = rq.CommittedInstanceID();" | ||
| )?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.instance_id = rq.CommittedInstanceIndex();" | ||
| )?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.sbt_record_offset = rq.CommittedInstanceContributionToHitGroupIndex();" | ||
| )?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.geometry_index = rq.CommittedGeometryIndex();" | ||
| )?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.primitive_index = rq.CommittedPrimitiveIndex();" | ||
| )?; | ||
| writeln!( | ||
| self.out, | ||
| " if( rq.CommittedStatus() == COMMITTED_TRIANGLE_HIT ) {{" | ||
| )?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.barycentrics = rq.CommittedTriangleBarycentrics();" | ||
| )?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.front_face = rq.CommittedTriangleFrontFace();" | ||
| )?; | ||
| writeln!(self.out, " }}")?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.object_to_world = rq.CommittedObjectToWorld4x3();" | ||
| )?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.world_to_object = rq.CommittedWorldToObject4x3();" | ||
| )?; | ||
| writeln!(self.out, " }}")?; | ||
| writeln!(self.out, " return ret;")?; | ||
| writeln!(self.out, "}}")?; | ||
| writeln!(self.out)?; | ||
| Ok(()) | ||
| } | ||
| pub(super) fn write_candidate_intersection_function( | ||
| &mut self, | ||
| module: &crate::Module, | ||
| ) -> BackendResult { | ||
| self.write_type(module, module.special_types.ray_intersection.unwrap())?; | ||
| write!(self.out, " GetCandidateIntersection(")?; | ||
| self.write_value_type(module, &TypeInner::RayQuery)?; | ||
| writeln!(self.out, " rq) {{")?; | ||
| write!(self.out, " ")?; | ||
| self.write_type(module, module.special_types.ray_intersection.unwrap())?; | ||
| write!(self.out, " ret = (")?; | ||
| self.write_type(module, module.special_types.ray_intersection.unwrap())?; | ||
| writeln!(self.out, ")0;")?; | ||
| writeln!(self.out, " CANDIDATE_TYPE kind = rq.CandidateType();")?; | ||
| writeln!( | ||
| self.out, | ||
| " if (kind == CANDIDATE_NON_OPAQUE_TRIANGLE) {{" | ||
| )?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.kind = {};", | ||
| RayQueryIntersection::Triangle as u32 | ||
| )?; | ||
| writeln!(self.out, " ret.t = rq.CandidateTriangleRayT();")?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.barycentrics = rq.CandidateTriangleBarycentrics();" | ||
| )?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.front_face = rq.CandidateTriangleFrontFace();" | ||
| )?; | ||
| writeln!(self.out, " }} else {{")?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.kind = {};", | ||
| RayQueryIntersection::Aabb as u32 | ||
| )?; | ||
| writeln!(self.out, " }}")?; | ||
|
|
||
| writeln!( | ||
| self.out, | ||
| " ret.instance_custom_index = rq.CandidateInstanceID();" | ||
| )?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.instance_id = rq.CandidateInstanceIndex();" | ||
| )?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.sbt_record_offset = rq.CandidateInstanceContributionToHitGroupIndex();" | ||
| )?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.geometry_index = rq.CandidateGeometryIndex();" | ||
| )?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.primitive_index = rq.CandidatePrimitiveIndex();" | ||
| )?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.object_to_world = rq.CandidateObjectToWorld4x3();" | ||
| )?; | ||
| writeln!( | ||
| self.out, | ||
| " ret.world_to_object = rq.CandidateWorldToObject4x3();" | ||
| )?; | ||
| writeln!(self.out, " return ret;")?; | ||
| writeln!(self.out, "}}")?; | ||
| writeln!(self.out)?; | ||
| Ok(()) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.