Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Code cleanup: Simplify decoupled scattering code a bit.

Browse Source
This commit is contained in:
Thomas Dinges
2014-07-07 13:27:50 +02:00
parent a472a544d3
commit ef22e972b1
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
intern/cycles/kernel/kernel_path.h
View File

@@ -109,7 +109,6 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg, RNG *rng, Ray ray,
/* scattering */ /* scattering */
VolumeIntegrateResult result = VOLUME_PATH_ATTENUATED; VolumeIntegrateResult result = VOLUME_PATH_ATTENUATED;
bool scatter = false;
if(volume_segment.closure_flag & SD_SCATTER) { if(volume_segment.closure_flag & SD_SCATTER) {
bool all = kernel_data.integrator.sample_all_lights_indirect; bool all = kernel_data.integrator.sample_all_lights_indirect;
@@ -127,9 +126,6 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg, RNG *rng, Ray ray,
result = kernel_volume_decoupled_scatter(kg, result = kernel_volume_decoupled_scatter(kg,
&state, &volume_ray, &volume_sd, &throughput, &state, &volume_ray, &volume_sd, &throughput,
rphase, rscatter, &volume_segment, NULL, true); rphase, rscatter, &volume_segment, NULL, true);
if(result == VOLUME_PATH_SCATTERED)
scatter = kernel_path_volume_bounce(kg, rng, &volume_sd, &throughput, &state, L, &ray, 1.0f);
} }
if(result != VOLUME_PATH_SCATTERED) if(result != VOLUME_PATH_SCATTERED)
@@ -139,7 +135,7 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg, RNG *rng, Ray ray,
kernel_volume_decoupled_free(kg, &volume_segment); kernel_volume_decoupled_free(kg, &volume_segment);
if(result == VOLUME_PATH_SCATTERED) { if(result == VOLUME_PATH_SCATTERED) {
if(scatter) if(kernel_path_volume_bounce(kg, rng, &volume_sd, &throughput, &state, L, &ray, 1.0f))
continue; continue;
else else
break; break;
@@ -494,7 +490,6 @@ ccl_device float4 kernel_path_integrate(KernelGlobals *kg, RNG *rng, int sample,
/* scattering */ /* scattering */
VolumeIntegrateResult result = VOLUME_PATH_ATTENUATED; VolumeIntegrateResult result = VOLUME_PATH_ATTENUATED;
bool scatter = false;
if(volume_segment.closure_flag & SD_SCATTER) { if(volume_segment.closure_flag & SD_SCATTER) {
bool all = false; bool all = false;
@@ -512,9 +507,6 @@ ccl_device float4 kernel_path_integrate(KernelGlobals *kg, RNG *rng, int sample,
result = kernel_volume_decoupled_scatter(kg, result = kernel_volume_decoupled_scatter(kg,
&state, &volume_ray, &volume_sd, &throughput, &state, &volume_ray, &volume_sd, &throughput,
rphase, rscatter, &volume_segment, NULL, true); rphase, rscatter, &volume_segment, NULL, true);
if(result == VOLUME_PATH_SCATTERED)
scatter = kernel_path_volume_bounce(kg, rng, &volume_sd, &throughput, &state, &L, &ray, 1.0f);
} }
if(result != VOLUME_PATH_SCATTERED) if(result != VOLUME_PATH_SCATTERED)
@@ -524,7 +516,7 @@ ccl_device float4 kernel_path_integrate(KernelGlobals *kg, RNG *rng, int sample,
kernel_volume_decoupled_free(kg, &volume_segment); kernel_volume_decoupled_free(kg, &volume_segment);
if(result == VOLUME_PATH_SCATTERED) { if(result == VOLUME_PATH_SCATTERED) {
if(scatter) if(kernel_path_volume_bounce(kg, rng, &volume_sd, &throughput, &state, &L, &ray, 1.0f))
continue; continue;
else else
break; break;