14 files changed, 22 insertions, 23 deletions
diff --git a/intern/cycles/device/oneapi/device.cpp b/intern/cycles/device/oneapi/device.cpp
index b6f0f0c2b42..f70425b32cf 100644
--- a/intern/cycles/device/oneapi/device.cpp
+++ b/intern/cycles/device/oneapi/device.cpp
@@ -76,7 +76,7 @@ bool device_oneapi_init()
   /* NOTE(@nsirgien): we need to enable JIT cache from here and
    * right now this cache policy is controlled by env. variables. */
   /* NOTE(hallade) we also disable use of copy engine as it
-   * improves stability as of intel/llvm sycl-nightly/20220529.
+   * improves stability as of intel/LLVM SYCL-nightly/20220529.
    * All these env variable can be set beforehand by end-users and
    * will in that case -not- be overwritten. */
 #  ifdef _WIN32
diff --git a/intern/cycles/device/oneapi/device_impl.cpp b/intern/cycles/device/oneapi/device_impl.cpp
index 8c8ab522b47..0c0afd1d2df 100644
--- a/intern/cycles/device/oneapi/device_impl.cpp
+++ b/intern/cycles/device/oneapi/device_impl.cpp
@@ -35,7 +35,7 @@ OneapiDevice::OneapiDevice(const DeviceInfo &info,
 
   oneapi_dll_.oneapi_set_error_cb(queue_error_cb, &oneapi_error_string_);
 
-  /* Oneapi calls should be initialised on this moment. */
+  /* OneAPI calls should be initialized on this moment. */
   assert(oneapi_dll_.oneapi_create_queue != nullptr);
 
   bool is_finished_ok = oneapi_dll_.oneapi_create_queue(device_queue_, info.num);
@@ -93,7 +93,7 @@ BVHLayoutMask OneapiDevice::get_bvh_layout_mask() const
 bool OneapiDevice::load_kernels(const uint requested_features)
 {
   assert(device_queue_);
-  /* NOTE(@nsirgien): oneAPI can support compilation of kernel code with sertain feature set
+  /* NOTE(@nsirgien): oneAPI can support compilation of kernel code with certain feature set
    * with specialization constants, but it hasn't been implemented yet. */
   (void)requested_features;
 
diff --git a/intern/cycles/device/oneapi/dll_interface.h b/intern/cycles/device/oneapi/dll_interface.h
index bc681ff8f64..0a888194e98 100644
--- a/intern/cycles/device/oneapi/dll_interface.h
+++ b/intern/cycles/device/oneapi/dll_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-/* Include kernel header to get access to sycl-specific types, like SyclQueue and
+/* Include kernel header to get access to SYCL-specific types, like SyclQueue and
  * OneAPIDeviceIteratorCallback. */
 #include "kernel/device/oneapi/kernel.h"
 
diff --git a/intern/cycles/device/oneapi/queue.h b/intern/cycles/device/oneapi/queue.h
index 09a015303b6..716cbfdc88c 100644
--- a/intern/cycles/device/oneapi/queue.h
+++ b/intern/cycles/device/oneapi/queue.h
@@ -17,7 +17,7 @@ CCL_NAMESPACE_BEGIN
 class OneapiDevice;
 class device_memory;
 
-/* Base class for Oneapi queues. */
+/* Base class for OneAPI queues. */
 class OneapiDeviceQueue : public DeviceQueue {
  public:
   explicit OneapiDeviceQueue(OneapiDevice *device);
diff --git a/intern/cycles/kernel/device/oneapi/compat.h b/intern/cycles/kernel/device/oneapi/compat.h
index 30b0f088ede..1b25259bcf5 100644
--- a/intern/cycles/kernel/device/oneapi/compat.h
+++ b/intern/cycles/kernel/device/oneapi/compat.h
@@ -193,7 +193,7 @@ ccl_always_inline float3 make_float3(float x)
 #include "util/types.h"
 
 /* NOTE(@nsirgien): Declaring these functions after types headers is very important because they
- * include oneAPI headers, which transitively include math.h headers which will cause redefintions
+ * include oneAPI headers, which transitively include math.h headers which will cause redefinitions
  * of the math defines because math.h also uses them and having them defined before math.h include
  * is actually UB. */
 /* Use fast math functions - get them from sycl::native namespace for native math function
diff --git a/intern/cycles/kernel/device/oneapi/dll_interface_template.h b/intern/cycles/kernel/device/oneapi/dll_interface_template.h
index 2d740b4c64a..22804490a70 100644
--- a/intern/cycles/kernel/device/oneapi/dll_interface_template.h
+++ b/intern/cycles/kernel/device/oneapi/dll_interface_template.h
@@ -27,7 +27,7 @@ DLL_INTERFACE_CALL(oneapi_usm_memset,
 DLL_INTERFACE_CALL(oneapi_run_test_kernel, bool, SyclQueue *queue)
 
 /* Operation with Kernel globals structure - map of global/constant allocation - filled before
- * render/kernel execution As we don't know in cycles sizeof this - Cycles will manage just as
+ * render/kernel execution As we don't know in cycles `sizeof` this - Cycles will manage just as
  * pointer. */
 DLL_INTERFACE_CALL(oneapi_kernel_globals_size, bool, SyclQueue *queue, size_t &kernel_global_size)
 DLL_INTERFACE_CALL(oneapi_set_global_memory,
diff --git a/intern/cycles/kernel/device/oneapi/image.h b/intern/cycles/kernel/device/oneapi/image.h
index 892558d40bf..6681977a675 100644
--- a/intern/cycles/kernel/device/oneapi/image.h
+++ b/intern/cycles/kernel/device/oneapi/image.h
@@ -216,7 +216,7 @@ template<typename T> struct NanoVDBInterpolator {
     int nix, niy, niz;
     int pix, piy, piz;
     int nnix, nniy, nniz;
-    /* Tricubic b-spline interpolation. */
+    /* Tri-cubic b-spline interpolation. */
     const float tx = svm_image_texture_frac(x - 0.5f, &ix);
     const float ty = svm_image_texture_frac(y - 0.5f, &iy);
     const float tz = svm_image_texture_frac(z - 0.5f, &iz);
@@ -355,7 +355,7 @@ ccl_device float4 kernel_tex_image_interp_3d(KernelGlobals, int id, float3 P, in
     return r;
   }
   else {
-    /* Tricubic interpolation. */
+    /* Tri-cubic interpolation. */
     int ix, iy, iz;
     float tx = svm_image_texture_frac(x - 0.5f, &ix);
     float ty = svm_image_texture_frac(y - 0.5f, &iy);
diff --git a/intern/cycles/kernel/device/oneapi/kernel.cpp b/intern/cycles/kernel/device/oneapi/kernel.cpp
index 62affe6e58e..2b915027bda 100644
--- a/intern/cycles/kernel/device/oneapi/kernel.cpp
+++ b/intern/cycles/kernel/device/oneapi/kernel.cpp
@@ -328,8 +328,8 @@ bool oneapi_enqueue_kernel(KernelContext *kernel_context,
     int num_states = *((int *)(args[0]));
     /* Round up to the next work-group. */
     size_t groups_count = (num_states + local_size - 1) / local_size;
-    /* NOTE(@nsirgien): As for now non-uniform workgroups don't work on most oneAPI devices, we
-     * extend work size to fit uniformity requirements. */
+    /* NOTE(@nsirgien): As for now non-uniform work-groups don't work on most oneAPI devices,
+     * we extend work size to fit uniformity requirements. */
     global_size = groups_count * local_size;
 
 #  ifdef WITH_ONEAPI_SYCL_HOST_ENABLED
diff --git a/intern/cycles/kernel/device/oneapi/kernel_templates.h b/intern/cycles/kernel/device/oneapi/kernel_templates.h
index 2dfc96292ed..41f9a9ba583 100644
--- a/intern/cycles/kernel/device/oneapi/kernel_templates.h
+++ b/intern/cycles/kernel/device/oneapi/kernel_templates.h
@@ -1,10 +1,9 @@
 #pragma once
 
 /* Some macro magic to generate templates for kernel arguments.
-   The resulting oneapi_call() template allows to call a SYCL/C++ kernel
-   with typed arguments by only giving it a void **args as given by Cycles.
-   The template will automatically cast from void* to the expectd type.
-   */
+ * The resulting oneapi_call() template allows to call a SYCL/C++ kernel
+ * with typed arguments by only giving it a void `**args` as given by Cycles.
+ * The template will automatically cast from void* to the expected type. */
 
 /* When expanded by the preprocessor, the generated templates will look like this example: */
 #if 0
diff --git a/intern/cycles/kernel/osl/services.cpp b/intern/cycles/kernel/osl/services.cpp
index 6e75ae54f33..78c23b858c4 100644
--- a/intern/cycles/kernel/osl/services.cpp
+++ b/intern/cycles/kernel/osl/services.cpp
@@ -1710,12 +1710,12 @@ bool OSLRenderServices::trace(TraceOpt &options,
 
   const KernelGlobalsCPU *kg = sd->osl_globals;
 
-  /* Can't raytrace from shaders like displacement, before BVH exists. */
+  /* Can't ray-trace from shaders like displacement, before BVH exists. */
   if (kernel_data.bvh.bvh_layout == BVH_LAYOUT_NONE) {
     return false;
   }
 
-  /* Raytrace, leaving out shadow opaque to avoid early exit. */
+  /* Ray-trace, leaving out shadow opaque to avoid early exit. */
   uint visibility = PATH_RAY_ALL_VISIBILITY - PATH_RAY_SHADOW_OPAQUE;
   tracedata->hit = scene_intersect(kg, &ray, visibility, &tracedata->isect);
   return tracedata->hit;
diff --git a/intern/cycles/kernel/svm/ao.h b/intern/cycles/kernel/svm/ao.h
index b477855dca3..e66c535824c 100644
--- a/intern/cycles/kernel/svm/ao.h
+++ b/intern/cycles/kernel/svm/ao.h
@@ -31,7 +31,7 @@ ccl_device float svm_ao(
     return 1.0f;
   }
 
-  /* Can't raytrace from shaders like displacement, before BVH exists. */
+  /* Can't ray-trace from shaders like displacement, before BVH exists. */
   if (kernel_data.bvh.bvh_layout == BVH_LAYOUT_NONE) {
     return 1.0f;
   }
diff --git a/intern/cycles/kernel/svm/bevel.h b/intern/cycles/kernel/svm/bevel.h
index f79bcae5cd2..790437d8e82 100644
--- a/intern/cycles/kernel/svm/bevel.h
+++ b/intern/cycles/kernel/svm/bevel.h
@@ -103,7 +103,7 @@ ccl_device float3 svm_bevel(
     return sd->N;
   }
 
-  /* Can't raytrace from shaders like displacement, before BVH exists. */
+  /* Can't ray-trace from shaders like displacement, before BVH exists. */
   if (kernel_data.bvh.bvh_layout == BVH_LAYOUT_NONE) {
     return sd->N;
   }
diff --git a/intern/cycles/kernel/svm/closure.h b/intern/cycles/kernel/svm/closure.h
index 305bd404d27..99a8fdd3be9 100644
--- a/intern/cycles/kernel/svm/closure.h
+++ b/intern/cycles/kernel/svm/closure.h
@@ -395,7 +395,7 @@ ccl_device_noinline int svm_node_closure_bsdf(KernelGlobals kg,
             if (kernel_data.integrator.caustics_refractive || (path_flag & PATH_RAY_DIFFUSE) == 0)
 #  endif
             {
-              /* This is to prevent mnee from receiving a null bsdf. */
+              /* This is to prevent MNEE from receiving a null BSDF. */
               float refraction_fresnel = fmaxf(0.0001f, 1.0f - fresnel);
               ccl_private MicrofacetBsdf *bsdf = (ccl_private MicrofacetBsdf *)bsdf_alloc(
                   sd, sizeof(MicrofacetBsdf), base_color * glass_weight * refraction_fresnel);
@@ -676,7 +676,7 @@ ccl_device_noinline int svm_node_closure_bsdf(KernelGlobals kg,
       if (kernel_data.integrator.caustics_refractive || (path_flag & PATH_RAY_DIFFUSE) == 0)
 #endif
       {
-        /* This is to prevent mnee from receiving a null bsdf. */
+        /* This is to prevent MNEE from receiving a null BSDF. */
         float refraction_fresnel = fmaxf(0.0001f, 1.0f - fresnel);
         ccl_private MicrofacetBsdf *bsdf = (ccl_private MicrofacetBsdf *)bsdf_alloc(
             sd, sizeof(MicrofacetBsdf), weight * refraction_fresnel);
diff --git a/intern/cycles/scene/scene.cpp b/intern/cycles/scene/scene.cpp
index 1fcc3331337..eedb2a4fa3a 100644
--- a/intern/cycles/scene/scene.cpp
+++ b/intern/cycles/scene/scene.cpp
@@ -499,9 +499,9 @@ void Scene::update_kernel_features()
     kernel_features |= KERNEL_FEATURE_CAMERA_MOTION;
   }
 
-  /* Figure out whether the scene will use shader raytrace we need at least
+  /* Figure out whether the scene will use shader ray-trace we need at least
    * one caustic light, one caustic caster and one caustic receiver to use
-   * and enable the mnee code path. */
+   * and enable the MNEE code path. */
   bool has_caustics_receiver = false;
   bool has_caustics_caster = false;
   bool has_caustics_light = false;