From 2964c4e1d08836b0ef2d0382579e8da173650b24 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 8 Dec 2021 11:30:03 +1100 Subject: Cleanup: spelling in comments --- intern/cycles/device/metal/bvh.mm | 6 +++--- intern/cycles/device/metal/device_impl.mm | 4 ++-- intern/cycles/device/metal/kernel.h | 2 +- intern/cycles/device/metal/kernel.mm | 2 +- intern/cycles/device/metal/queue.mm | 2 +- source/blender/blenkernel/BKE_armature.h | 4 ++-- source/blender/blenkernel/BKE_geometry_set.hh | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/intern/cycles/device/metal/bvh.mm b/intern/cycles/device/metal/bvh.mm index 7c79196845a..1953102cb41 100644 --- a/intern/cycles/device/metal/bvh.mm +++ b/intern/cycles/device/metal/bvh.mm @@ -160,7 +160,7 @@ bool BVHMetal::build_BLAS_mesh(Progress &progress, } /* Force a single any-hit call, so shadow record-all behavior works correctly */ - /* (Match optix behaviour: unsigned int build_flags = + /* (Match optix behavior: unsigned int build_flags = * OPTIX_GEOMETRY_FLAG_REQUIRE_SINGLE_ANYHIT_CALL;) */ geomDesc.allowDuplicateIntersectionFunctionInvocation = false; @@ -359,7 +359,7 @@ bool BVHMetal::build_BLAS_hair(Progress &progress, geomDescMotion.intersectionFunctionTableOffset = 1; /* Force a single any-hit call, so shadow record-all behavior works correctly */ - /* (Match optix behaviour: unsigned int build_flags = + /* (Match optix behavior: unsigned int build_flags = * OPTIX_GEOMETRY_FLAG_REQUIRE_SINGLE_ANYHIT_CALL;) */ geomDescMotion.allowDuplicateIntersectionFunctionInvocation = false; geomDescMotion.opaque = true; @@ -375,7 +375,7 @@ bool BVHMetal::build_BLAS_hair(Progress &progress, geomDescNoMotion.intersectionFunctionTableOffset = 1; /* Force a single any-hit call, so shadow record-all behavior works correctly */ - /* (Match optix behaviour: unsigned int build_flags = + /* (Match optix behavior: unsigned int build_flags = * OPTIX_GEOMETRY_FLAG_REQUIRE_SINGLE_ANYHIT_CALL;) */ geomDescNoMotion.allowDuplicateIntersectionFunctionInvocation = false; geomDescNoMotion.opaque = true; diff --git a/intern/cycles/device/metal/device_impl.mm b/intern/cycles/device/metal/device_impl.mm index 69a08ca07d1..fd249204646 100644 --- a/intern/cycles/device/metal/device_impl.mm +++ b/intern/cycles/device/metal/device_impl.mm @@ -333,7 +333,7 @@ bool MetalDevice::load_kernels(const uint _kernel_features) /* local helper: fetch the kernel source code, adjust it for specific PSO_.. kernel_type flavor, * then compile it into a MTLLibrary */ auto fetch_and_compile_source = [&](int kernel_type) { - /* record the source uesd to compile this library, for hash building later */ + /* Record the source used to compile this library, for hash building later. */ string &source = source_used_for_compile[kernel_type]; switch (kernel_type) { @@ -925,7 +925,7 @@ void MetalDevice::tex_alloc(device_texture &mem) } } - /* optimise the texture for GPU access */ + /* Optimize the texture for GPU access. */ id commandBuffer = [mtlGeneralCommandQueue commandBuffer]; id blitCommandEncoder = [commandBuffer blitCommandEncoder]; [blitCommandEncoder optimizeContentsForGPUAccess:mtlTexture]; diff --git a/intern/cycles/device/metal/kernel.h b/intern/cycles/device/metal/kernel.h index d4941627fd8..4874af1bfa6 100644 --- a/intern/cycles/device/metal/kernel.h +++ b/intern/cycles/device/metal/kernel.h @@ -50,7 +50,7 @@ enum { */ PSO_GENERIC, - /* A kernel that is relatively quick to compile, but is specialised for the + /* A kernel that is relatively quick to compile, but is specialized for the * scene being rendered. It only contains the functionality and even baked in * constants for values that means it needs to be recompiled whenever a * dependent setting is changed. The render performance of this kernel is diff --git a/intern/cycles/device/metal/kernel.mm b/intern/cycles/device/metal/kernel.mm index 9cbad10bf5a..f5c3adbce25 100644 --- a/intern/cycles/device/metal/kernel.mm +++ b/intern/cycles/device/metal/kernel.mm @@ -455,7 +455,7 @@ bool MetalDeviceKernels::load(MetalDevice *device, int kernel_type) return; } - /* Only specialise kernels where it can make an impact */ + /* Only specialize kernels where it can make an impact. */ if (kernel_type == PSO_SPECIALISED) { if (i < DEVICE_KERNEL_INTEGRATOR_INTERSECT_CLOSEST || i > DEVICE_KERNEL_INTEGRATOR_MEGAKERNEL) { diff --git a/intern/cycles/device/metal/queue.mm b/intern/cycles/device/metal/queue.mm index 2545fa0f3b0..ced01e7b9b6 100644 --- a/intern/cycles/device/metal/queue.mm +++ b/intern/cycles/device/metal/queue.mm @@ -136,7 +136,7 @@ bool MetalDeviceQueue::enqueue(DeviceKernel kernel, arg_buffer_length += sizeof(KernelParamsMetal); arg_buffer_length = round_up(arg_buffer_length, 256); - /* Metal ancilliary bindless pointers */ + /* Metal ancillary bindless pointers. */ size_t metal_offsets = arg_buffer_length; arg_buffer_length += metal_device->mtlAncillaryArgEncoder.encodedLength; arg_buffer_length = round_up(arg_buffer_length, metal_device->mtlAncillaryArgEncoder.alignment); diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h index aaf6c540878..fcba7d9d365 100644 --- a/source/blender/blenkernel/BKE_armature.h +++ b/source/blender/blenkernel/BKE_armature.h @@ -401,8 +401,8 @@ void BKE_bone_parent_transform_apply(const struct BoneParentTransform *bpt, * * Construct the matrices (rot/scale and loc) * to apply the PoseChannels into the armature (object) space. - * I.e. (roughly) the "pose_mat(b-1) * yoffs(b-1) * d_root(b) * bone_mat(b)" in the - * pose_mat(b)= pose_mat(b-1) * yoffs(b-1) * d_root(b) * bone_mat(b) * chan_mat(b) + * I.e. (roughly) the `pose_mat(b-1) * yoffs(b-1) * d_root(b) * bone_mat(b)` in the + * `pose_mat(b)= pose_mat(b-1) * yoffs(b-1) * d_root(b) * bone_mat(b) * chan_mat(b)` * ...function. * * This allows to get the transformations of a bone in its object space, diff --git a/source/blender/blenkernel/BKE_geometry_set.hh b/source/blender/blenkernel/BKE_geometry_set.hh index 1399da0219c..7d33cb81f0f 100644 --- a/source/blender/blenkernel/BKE_geometry_set.hh +++ b/source/blender/blenkernel/BKE_geometry_set.hh @@ -264,7 +264,7 @@ inline constexpr bool is_geometry_component_v = std::is_base_of_v