Cleanup: comments (long lines) in cycles

5 files changed, 19 insertions, 16 deletions

diff --git a/intern/cycles/kernel/split/kernel_buffer_update.h b/intern/cycles/kernel/split/kernel_buffer_update.h
index e77743350dc..e37be5b405e 100644
--- a/intern/cycles/kernel/split/kernel_buffer_update.h
+++ b/intern/cycles/kernel/split/kernel_buffer_update.h
@@ -132,8 +132,8 @@ ccl_device void kernel_buffer_update(KernelGlobals *kg,
 
         if (ray->t != 0.0f) {
           /* Initialize throughput, path radiance, Ray, PathState;
-         * These rays proceed with path-iteration.
-         */
+           * These rays proceed with path-iteration.
+           */
           *throughput = make_float3(1.0f, 1.0f, 1.0f);
           path_radiance_init(L, kernel_data.film.use_light_pass);
           path_state_init(kg,
diff --git a/intern/cycles/kernel/split/kernel_data_init.h b/intern/cycles/kernel/split/kernel_data_init.h
index 52930843f56..2f83a10316d 100644
--- a/intern/cycles/kernel/split/kernel_data_init.h
+++ b/intern/cycles/kernel/split/kernel_data_init.h
@@ -46,10 +46,10 @@ void KERNEL_FUNCTION_FULL_NAME(data_init)(
     int sh,
     int offset,
     int stride,
-    ccl_global int *Queue_index, /* Tracks the number of elements in queues */
-    int queuesize,               /* size (capacity) of the queue */
-    ccl_global char *
-        use_queues_flag, /* flag to decide if scene-intersect kernel should use queues to fetch ray index */
+    ccl_global int *Queue_index,      /* Tracks the number of elements in queues */
+    int queuesize,                    /* size (capacity) of the queue */
+    ccl_global char *use_queues_flag, /* flag to decide if scene-intersect kernel should use queues
+                                         to fetch ray index */
     ccl_global unsigned int *work_pools, /* Work pool for each work group */
     unsigned int num_samples,
     ccl_global float *buffer)
diff --git a/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h b/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
index 63bc5a8e0ce..5cd4131e2ae 100644
--- a/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
+++ b/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
@@ -114,9 +114,9 @@ ccl_device void kernel_holdout_emission_blurring_pathtermination_ao(
 
     if (IS_STATE(ray_state, ray_index, RAY_ACTIVE)) {
       /* Path termination. this is a strange place to put the termination, it's
-     * mainly due to the mixed in MIS that we use. gives too many unneeded
-     * shader evaluations, only need emission if we are going to terminate.
-     */
+       * mainly due to the mixed in MIS that we use. gives too many unneeded
+       * shader evaluations, only need emission if we are going to terminate.
+       */
       float probability = path_state_continuation_probability(kg, state, throughput);
 
       if (probability == 0.0f) {
diff --git a/intern/cycles/kernel/split/kernel_next_iteration_setup.h b/intern/cycles/kernel/split/kernel_next_iteration_setup.h
index 781ce869374..3c2f6038035 100644
--- a/intern/cycles/kernel/split/kernel_next_iteration_setup.h
+++ b/intern/cycles/kernel/split/kernel_next_iteration_setup.h
@@ -109,9 +109,9 @@ ccl_device void kernel_next_iteration_setup(KernelGlobals *kg,
 
   if (ccl_global_id(0) == 0 && ccl_global_id(1) == 0) {
     /* If we are here, then it means that scene-intersect kernel
-    * has already been executed atleast once. From the next time,
-    * scene-intersect kernel may operate on queues to fetch ray index
-    */
+     * has already been executed atleast once. From the next time,
+     * scene-intersect kernel may operate on queues to fetch ray index
+     */
     *kernel_split_params.use_queues_flag = 1;
 
     /* Mark queue indices of QUEUE_SHADOW_RAY_CAST_AO_RAYS and
diff --git a/intern/cycles/kernel/split/kernel_split_data_types.h b/intern/cycles/kernel/split/kernel_split_data_types.h
index 6ff3f5bdb55..ac4a450ca2b 100644
--- a/intern/cycles/kernel/split/kernel_split_data_types.h
+++ b/intern/cycles/kernel/split/kernel_split_data_types.h
@@ -19,7 +19,8 @@
 
 CCL_NAMESPACE_BEGIN
 
-/* parameters used by the split kernels, we use a single struct to avoid passing these to each kernel */
+/* parameters used by the split kernels, we use a single struct to avoid passing these to each
+ * kernel */
 
 typedef struct SplitParams {
   WorkTile tile;
@@ -112,7 +113,8 @@ typedef ccl_global struct SplitBranchedState {
   SPLIT_DATA_BRANCHED_ENTRIES \
   SPLIT_DATA_ENTRY(ShaderData, _sd, 0)
 
-/* entries to be copied to inactive rays when sharing branched samples (TODO: which are actually needed?) */
+/* Entries to be copied to inactive rays when sharing branched samples
+ * (TODO: which are actually needed?) */
 #define SPLIT_DATA_ENTRIES_BRANCHED_SHARED \
   SPLIT_DATA_ENTRY(ccl_global float3, throughput, 1) \
   SPLIT_DATA_ENTRY(PathRadiance, path_radiance, 1) \
@@ -134,8 +136,9 @@ typedef struct SplitData {
   SPLIT_DATA_ENTRIES
 #undef SPLIT_DATA_ENTRY
 
-  /* this is actually in a separate buffer from the rest of the split state data (so it can be read back from
-   * the host easily) but is still used the same as the other data so we have it here in this struct as well
+  /* this is actually in a separate buffer from the rest of the split state data (so it can be read
+   * back from the host easily) but is still used the same as the other data so we have it here in
+   * this struct as well
    */
   ccl_global char *ray_state;
 } SplitData;