Replace <const INTERSECTION: u32> with two functions (#750)

* Replace <const INTERSECTION: u32> with two functions

* Fix doc URLs

Author: khyperia

crates/spirv-std/src/ray_tracing.rs

@@ -9,6 +9,7 @@ pub fn main(#[spirv(descriptor_set = 0, binding = 0)] accel: &AccelerationStruct
     unsafe {
         spirv_std::ray_query!(let mut handle);
         handle.initialize(accel, RayFlags::NONE, 0, Vec3::ZERO, 0.0, Vec3::ZERO, 0.0);
-        let barycentric_coords: glam::Vec2 = handle.get_intersection_barycentrics::<_, 5>();
+        let barycentric_coords: glam::Vec2 = handle.get_candidate_intersection_barycentrics();
+        let barycentric_coords: glam::Vec2 = handle.get_committed_intersection_barycentrics();
     }
 }

tests/ui/arch/ray_query_get_intersection_barycentrics_khr.rs

@@ -9,6 +9,7 @@ pub fn main(#[spirv(descriptor_set = 0, binding = 0)] accel: &AccelerationStruct
     unsafe {
         spirv_std::ray_query!(let mut handle);
         handle.initialize(accel, RayFlags::NONE, 0, Vec3::ZERO, 0.0, Vec3::ZERO, 0.0);
-        assert!(handle.get_intersection_front_face::<5>());
+        assert!(handle.get_candidate_intersection_front_face());
+        assert!(handle.get_committed_intersection_front_face());
     }
 }

tests/ui/arch/ray_query_get_intersection_front_face_khr.rs

@@ -9,6 +9,7 @@ pub fn main(#[spirv(descriptor_set = 0, binding = 0)] accel: &AccelerationStruct
     unsafe {
         spirv_std::ray_query!(let mut handle);
         handle.initialize(accel, RayFlags::NONE, 0, Vec3::ZERO, 0.0, Vec3::ZERO, 0.0);
-        let t = handle.get_intersection_geometry_index::<5>();
+        let t = handle.get_candidate_intersection_geometry_index();
+        let t = handle.get_committed_intersection_geometry_index();
     }
 }

tests/ui/arch/ray_query_get_intersection_geometry_index_khr.rs

@@ -9,6 +9,7 @@ pub fn main(#[spirv(descriptor_set = 0, binding = 0)] accel: &AccelerationStruct
     unsafe {
         spirv_std::ray_query!(let mut handle);
         handle.initialize(accel, RayFlags::NONE, 0, Vec3::ZERO, 0.0, Vec3::ZERO, 0.0);
-        let index = handle.get_intersection_instance_custom_index::<5>();
+        let index = handle.get_candidate_intersection_instance_custom_index();
+        let index = handle.get_committed_intersection_instance_custom_index();
     }
 }

tests/ui/arch/ray_query_get_intersection_instance_custom_index_khr.rs

@@ -9,6 +9,7 @@ pub fn main(#[spirv(descriptor_set = 0, binding = 0)] accel: &AccelerationStruct
     unsafe {
         spirv_std::ray_query!(let mut handle);
         handle.initialize(accel, RayFlags::NONE, 0, Vec3::ZERO, 0.0, Vec3::ZERO, 0.0);
-        let id = handle.get_intersection_instance_id::<5>();
+        let id = handle.get_candidate_intersection_instance_id();
+        let id = handle.get_committed_intersection_instance_id();
     }
 }

tests/ui/arch/ray_query_get_intersection_instance_id_khr.rs

@@ -9,6 +9,7 @@ pub fn main(#[spirv(descriptor_set = 0, binding = 0)] accel: &AccelerationStruct
     unsafe {
         spirv_std::ray_query!(let mut handle);
         handle.initialize(accel, RayFlags::NONE, 0, Vec3::ZERO, 0.0, Vec3::ZERO, 0.0);
-        let direction: glam::Vec3 = handle.get_intersection_object_ray_direction::<_, 5>();
+        let direction: glam::Vec3 = handle.get_candidate_intersection_object_ray_direction();
+        let direction: glam::Vec3 = handle.get_committed_intersection_object_ray_direction();
     }
 }

tests/ui/arch/ray_query_get_intersection_object_ray_direction_khr.rs

@@ -9,6 +9,7 @@ pub fn main(#[spirv(descriptor_set = 0, binding = 0)] accel: &AccelerationStruct
     unsafe {
         spirv_std::ray_query!(let mut handle);
         handle.initialize(accel, RayFlags::NONE, 0, Vec3::ZERO, 0.0, Vec3::ZERO, 0.0);
-        let origin: glam::Vec3 = handle.get_intersection_object_ray_origin::<_, 5>();
+        let origin: glam::Vec3 = handle.get_candidate_intersection_object_ray_origin();
+        let origin: glam::Vec3 = handle.get_committed_intersection_object_ray_origin();
     }
 }

tests/ui/arch/ray_query_get_intersection_object_ray_origin_khr.rs

@@ -9,6 +9,7 @@ pub fn main(#[spirv(descriptor_set = 0, binding = 0)] accel: &AccelerationStruct
     unsafe {
         spirv_std::ray_query!(let mut handle);
         handle.initialize(accel, RayFlags::NONE, 0, Vec3::ZERO, 0.0, Vec3::ZERO, 0.0);
-        let matrix: [glam::Vec3; 4] = handle.get_intersection_object_to_world::<_, 5>();
+        let matrix: [glam::Vec3; 4] = handle.get_candidate_intersection_object_to_world();
+        let matrix: [glam::Vec3; 4] = handle.get_committed_intersection_object_to_world();
     }
 }

tests/ui/arch/ray_query_get_intersection_object_to_world_khr.rs

@@ -9,6 +9,7 @@ pub fn main(#[spirv(descriptor_set = 0, binding = 0)] accel: &AccelerationStruct
     unsafe {
         spirv_std::ray_query!(let mut handle);
         handle.initialize(accel, RayFlags::NONE, 0, Vec3::ZERO, 0.0, Vec3::ZERO, 0.0);
-        handle.get_intersection_primitive_index::<5>();
+        handle.get_candidate_intersection_primitive_index();
+        handle.get_committed_intersection_primitive_index();
     }
 }

tests/ui/arch/ray_query_get_intersection_primitive_index_khr.rs

@@ -9,6 +9,7 @@ pub fn main(#[spirv(descriptor_set = 0, binding = 0)] accel: &AccelerationStruct
     unsafe {
         spirv_std::ray_query!(let mut handle);
         handle.initialize(accel, RayFlags::NONE, 0, Vec3::ZERO, 0.0, Vec3::ZERO, 0.0);
-        let offset = handle.get_intersection_shader_binding_table_record_offset::<5>();
+        let offset = handle.get_candidate_intersection_shader_binding_table_record_offset();
+        let offset = handle.get_committed_intersection_shader_binding_table_record_offset();
     }
 }

tests/ui/arch/ray_query_get_intersection_shader_binding_table_record_offset_khr.rs

@@ -9,6 +9,7 @@ pub fn main(#[spirv(descriptor_set = 0, binding = 0)] accel: &AccelerationStruct
     unsafe {
         spirv_std::ray_query!(let mut handle);
         handle.initialize(accel, RayFlags::NONE, 0, Vec3::ZERO, 0.0, Vec3::ZERO, 0.0);
-        let t = handle.get_intersection_t::<5>();
+        let t = handle.get_candidate_intersection_t();
+        let t = handle.get_committed_intersection_t();
     }
 }

tests/ui/arch/ray_query_get_intersection_t_khr.rs

@@ -9,6 +9,7 @@ pub fn main(#[spirv(descriptor_set = 0, binding = 0)] accel: &AccelerationStruct
     unsafe {
         spirv_std::ray_query!(let mut handle);
         handle.initialize(accel, RayFlags::NONE, 0, Vec3::ZERO, 0.0, Vec3::ZERO, 0.0);
-        handle.get_intersection_type::<5>();
+        handle.get_candidate_intersection_type();
+        handle.get_committed_intersection_type();
     }
 }