Skip to content

Commit b5bbe64

Browse files
committed
Clippy & fmt
1 parent 4d8337d commit b5bbe64

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

naga/src/back/spv/ray.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,8 @@ impl Writer {
10371037
let bool_type_id = self.get_bool_type_id();
10381038
let bool_ptr_ty = self.get_pointer_type_id(bool_type_id, spirv::StorageClass::Function);
10391039

1040-
let (func_id, mut function, arg_ids) = self.write_function_signature(&[ray_query_type_id, u32_ptr_ty], bool_type_id);
1040+
let (func_id, mut function, arg_ids) =
1041+
self.write_function_signature(&[ray_query_type_id, u32_ptr_ty], bool_type_id);
10411042

10421043
let query_id = arg_ids[0];
10431044
let init_tracker_id = arg_ids[1];
@@ -1163,7 +1164,10 @@ impl Writer {
11631164

11641165
let bool_type_id = self.get_bool_type_id();
11651166

1166-
let (func_id, mut function, arg_ids) = self.write_function_signature(&[ray_query_type_id, u32_ptr_ty, f32_type_id, f32_ptr_type_id], self.void_type);
1167+
let (func_id, mut function, arg_ids) = self.write_function_signature(
1168+
&[ray_query_type_id, u32_ptr_ty, f32_type_id],
1169+
self.void_type,
1170+
);
11671171

11681172
let query_id = arg_ids[0];
11691173
let init_tracker_id = arg_ids[1];
@@ -1452,7 +1456,8 @@ impl Writer {
14521456

14531457
let bool_type_id = self.get_bool_type_id();
14541458

1455-
let (func_id, mut function, arg_ids) = self.write_function_signature(&[ray_query_type_id, u32_ptr_ty], self.void_type);
1459+
let (func_id, mut function, arg_ids) =
1460+
self.write_function_signature(&[ray_query_type_id, u32_ptr_ty], self.void_type);
14561461

14571462
let query_id = arg_ids[0];
14581463
let init_tracker_id = arg_ids[1];
@@ -1613,7 +1618,10 @@ impl Writer {
16131618

16141619
let bool_type_id = self.get_bool_type_id();
16151620

1616-
let (func_id, mut function, arg_ids) = self.write_function_signature(&[ray_query_type_id, u32_ptr_ty], rq_get_vertex_positions_ty_id);
1621+
let (func_id, mut function, arg_ids) = self.write_function_signature(
1622+
&[ray_query_type_id, u32_ptr_ty],
1623+
rq_get_vertex_positions_ty_id,
1624+
);
16171625

16181626
let query_id = arg_ids[0];
16191627
let init_tracker_id = arg_ids[1];

wgpu-types/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7932,11 +7932,11 @@ pub struct ShaderRuntimeChecks {
79327932
/// on a ray query must obey these rules (functions using wgsl naming)
79337933
/// - `rayQueryInitialize` must have called before `rayQueryProceed`
79347934
/// - `rayQueryProceed` must have been called, returned true and have hit an AABB before
7935-
/// `rayQueryGenerateIntersection` is called
7935+
/// `rayQueryGenerateIntersection` is called
79367936
/// - `rayQueryProceed` must have been called, returned true and have hit a triangle before
7937-
/// `rayQueryConfirmIntersection` is called
7937+
/// `rayQueryConfirmIntersection` is called
79387938
/// - `rayQueryProceed` must have been called and have returned true before `rayQueryTerminate`,
7939-
/// `getCandidateHitVertexPositions` or `rayQueryGetCandidateIntersection` is called
7939+
/// `getCandidateHitVertexPositions` or `rayQueryGetCandidateIntersection` is called
79407940
/// - `rayQueryProceed` must have been called and have returned false before `rayQueryGetCommittedIntersection`
79417941
/// or `getCommittedHitVertexPositions` are called
79427942
///

0 commit comments

Comments
 (0)