Commit: 100b2ad7754daaaa670ab2d84889539b2c850dda
Author: Sergey Sharybin
Date: Mon Sep 19 16:04:45 2016 +0200
Branches: master
https://developer.blender.org/rB100b2ad7754daaaa670ab2d84889539b2c850dda
Cycles: Cleanup code style in split kernel
===================================================================
M intern/cycles/kernel/split/kernel_background_buffer_update.h
M intern/cycles/kernel/split/kernel_data_init.h
M
intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
M intern/cycles/kernel/split/kernel_next_iteration_setup.h
===================================================================
diff --git a/intern/cycles/kernel/split/kernel_background_buffer_update.h
b/intern/cycles/kernel/split/kernel_background_buffer_update.h
index f42d0a9..9bfa71c 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 e3dbc43..6e158d5 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 78dada8..435d117 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 74da80b..816f3a6 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];
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
