sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: Cleanup code style in split kernel

Browse Source
This commit is contained in:
Sergey Sharybin 2016-09-19 16:04:45 +02:00
parent 1f5cd85976
commit 100b2ad775
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/kernel/split/kernel_background_buffer_update.h
View File

@ -232,7 +232,8 @@ ccl_device char kernel_background_buffer_update(
#endif #endif
ASSIGN_RAY_STATE(ray_state, ray_index, RAY_REGENERATED); ASSIGN_RAY_STATE(ray_state, ray_index, RAY_REGENERATED);
enqueue_flag = 1; enqueue_flag = 1;
} else { }
else {
/* These rays do not participate in path-iteration. */ /* These rays do not participate in path-iteration. */
float4 L_rad = make_float4(0.0f, 0.0f, 0.0f, 0.0f); float4 L_rad = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
/* Accumulate result in output buffer. */ /* Accumulate result in output buffer. */

3
intern/cycles/kernel/split/kernel_data_init.h
View File

@ -215,7 +215,8 @@ ccl_device void kernel_data_init(
#ifdef __KERNEL_DEBUG__ #ifdef __KERNEL_DEBUG__
debug_data_init(&debugdata_coop[ray_index]); debug_data_init(&debugdata_coop[ray_index]);
#endif #endif
} else { }
else {
/* These rays do not participate in path-iteration. */ /* These rays do not participate in path-iteration. */
float4 L_rad = make_float4(0.0f, 0.0f, 0.0f, 0.0f); float4 L_rad = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
/* Accumulate result in output buffer. */ /* Accumulate result in output buffer. */

3
intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
View File

@ -212,7 +212,8 @@ ccl_device void kernel_holdout_emission_blurring_pathtermination_ao(
if(terminate >= probability) { if(terminate >= probability) {
ASSIGN_RAY_STATE(ray_state, ray_index, RAY_UPDATE_BUFFER); ASSIGN_RAY_STATE(ray_state, ray_index, RAY_UPDATE_BUFFER);
*enqueue_flag = 1; *enqueue_flag = 1;
} else { }
else {
throughput_coop[ray_index] = throughput/probability; throughput_coop[ray_index] = throughput/probability;
} }
} }

2
intern/cycles/kernel/split/kernel_next_iteration_setup.h
View File

@ -126,7 +126,7 @@ ccl_device char kernel_next_iteration_setup(
if(IS_STATE(ray_state, ray_index, RAY_ACTIVE)) { if(IS_STATE(ray_state, ray_index, RAY_ACTIVE)) {
ccl_global float3 *throughput = &throughput_coop[ray_index]; ccl_global float3 *throughput = &throughput_coop[ray_index];
ccl_global Ray *ray = &Ray_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]; state = &PathState_coop[ray_index];
L = &PathRadiance_coop[ray_index]; L = &PathRadiance_coop[ray_index];