diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-19 17:04:45 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-19 17:05:12 +0300 |
commit | 100b2ad7754daaaa670ab2d84889539b2c850dda (patch) | |
tree | e84fe3c237f281cfc5fb7a8b91a01c4153b0c377 /intern/cycles/kernel | |
parent | 1f5cd85976df79a5db1fceaf67226621d66e2a94 (diff) |
Cycles: Cleanup code style in split kernel
Diffstat (limited to 'intern/cycles/kernel')
4 files changed, 7 insertions, 4 deletions
diff --git a/intern/cycles/kernel/split/kernel_background_buffer_update.h b/intern/cycles/kernel/split/kernel_background_buffer_update.h index f42d0a985bb..9bfa71c75ef 100644 --- a/intern/cycles/kernel/split/kernel_background_buffer_update.h +++ b/intern/cycles/kernel/split/kernel_background_buffer_update.h @@ -232,7 +232,8 @@ ccl_device char kernel_background_buffer_update( #endif ASSIGN_RAY_STATE(ray_state, ray_index, RAY_REGENERATED); enqueue_flag = 1; - } else { + } + else { /* These rays do not participate in path-iteration. */ float4 L_rad = make_float4(0.0f, 0.0f, 0.0f, 0.0f); /* Accumulate result in output buffer. */ diff --git a/intern/cycles/kernel/split/kernel_data_init.h b/intern/cycles/kernel/split/kernel_data_init.h index e3dbc43757e..6e158d53d23 100644 --- a/intern/cycles/kernel/split/kernel_data_init.h +++ b/intern/cycles/kernel/split/kernel_data_init.h @@ -215,7 +215,8 @@ ccl_device void kernel_data_init( #ifdef __KERNEL_DEBUG__ debug_data_init(&debugdata_coop[ray_index]); #endif - } else { + } + else { /* These rays do not participate in path-iteration. */ float4 L_rad = make_float4(0.0f, 0.0f, 0.0f, 0.0f); /* Accumulate result in output 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 78dada82d89..435d1171d5c 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 @@ -212,7 +212,8 @@ ccl_device void kernel_holdout_emission_blurring_pathtermination_ao( if(terminate >= probability) { ASSIGN_RAY_STATE(ray_state, ray_index, RAY_UPDATE_BUFFER); *enqueue_flag = 1; - } else { + } + else { throughput_coop[ray_index] = throughput/probability; } } diff --git a/intern/cycles/kernel/split/kernel_next_iteration_setup.h b/intern/cycles/kernel/split/kernel_next_iteration_setup.h index 74da80b52cc..816f3a6fbff 100644 --- a/intern/cycles/kernel/split/kernel_next_iteration_setup.h +++ b/intern/cycles/kernel/split/kernel_next_iteration_setup.h @@ -126,7 +126,7 @@ ccl_device char kernel_next_iteration_setup( if(IS_STATE(ray_state, ray_index, RAY_ACTIVE)) { ccl_global float3 *throughput = &throughput_coop[ray_index]; ccl_global Ray *ray = &Ray_coop[ray_index]; - ccl_global RNG* rng = &rng_coop[ray_index]; + ccl_global RNG *rng = &rng_coop[ray_index]; state = &PathState_coop[ray_index]; L = &PathRadiance_coop[ray_index]; |