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

Cleanup: Remove unused variable in kernel_path_volume_bounce().

Browse Source
This commit is contained in:
Thomas Dinges
2014-08-24 23:06:30 +02:00
parent 031620aba2
commit a25484eefa
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,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(kernel_path_volume_bounce(kg, rng, &volume_sd, &throughput, &state, L, &ray, 1.0f)) if(kernel_path_volume_bounce(kg, rng, &volume_sd, &throughput, &state, L, &ray))
continue; continue;
else else
break; break;
@@ -157,7 +157,7 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg, RNG *rng, Ray ray,
kernel_path_volume_connect_light(kg, rng, &volume_sd, throughput, &state, L, 1.0f); kernel_path_volume_connect_light(kg, rng, &volume_sd, throughput, &state, L, 1.0f);
/* indirect light bounce */ /* indirect light bounce */
if(kernel_path_volume_bounce(kg, rng, &volume_sd, &throughput, &state, L, &ray, 1.0f)) if(kernel_path_volume_bounce(kg, rng, &volume_sd, &throughput, &state, L, &ray))
continue; continue;
else else
break; break;
@@ -524,7 +524,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(kernel_path_volume_bounce(kg, rng, &volume_sd, &throughput, &state, &L, &ray, 1.0f)) if(kernel_path_volume_bounce(kg, rng, &volume_sd, &throughput, &state, &L, &ray))
continue; continue;
else else
break; break;
@@ -544,7 +544,7 @@ ccl_device float4 kernel_path_integrate(KernelGlobals *kg, RNG *rng, int sample,
kernel_path_volume_connect_light(kg, rng, &volume_sd, throughput, &state, &L, 1.0f); kernel_path_volume_connect_light(kg, rng, &volume_sd, throughput, &state, &L, 1.0f);
/* indirect light bounce */ /* indirect light bounce */
if(kernel_path_volume_bounce(kg, rng, &volume_sd, &throughput, &state, &L, &ray, 1.0f)) if(kernel_path_volume_bounce(kg, rng, &volume_sd, &throughput, &state, &L, &ray))
continue; continue;
else else
break; break;
@@ -866,7 +866,7 @@ ccl_device float4 kernel_branched_path_integrate(KernelGlobals *kg, RNG *rng, in
kernel_assert(result == VOLUME_PATH_SCATTERED); kernel_assert(result == VOLUME_PATH_SCATTERED);
if(kernel_path_volume_bounce(kg, rng, &volume_sd, &tp, &ps, &L, &pray, num_samples_inv)) { if(kernel_path_volume_bounce(kg, rng, &volume_sd, &tp, &ps, &L, &pray)) {
kernel_path_indirect(kg, rng, pray, tp*num_samples_inv, num_samples, ps, &L); kernel_path_indirect(kg, rng, pray, tp*num_samples_inv, num_samples, ps, &L);
/* for render passes, sum and reset indirect light pass variables /* for render passes, sum and reset indirect light pass variables
@@ -910,7 +910,7 @@ ccl_device float4 kernel_branched_path_integrate(KernelGlobals *kg, RNG *rng, in
* alternatively get decoupled ray marching working on the GPU */ * alternatively get decoupled ray marching working on the GPU */
kernel_path_volume_connect_light(kg, rng, &volume_sd, throughput, &state, &L, num_samples_inv); kernel_path_volume_connect_light(kg, rng, &volume_sd, throughput, &state, &L, num_samples_inv);
if(kernel_path_volume_bounce(kg, rng, &volume_sd, &tp, &ps, &L, &pray, num_samples_inv)) { if(kernel_path_volume_bounce(kg, rng, &volume_sd, &tp, &ps, &L, &pray)) {
kernel_path_indirect(kg, rng, pray, tp*num_samples_inv, num_samples, ps, &L); kernel_path_indirect(kg, rng, pray, tp*num_samples_inv, num_samples, ps, &L);
/* for render passes, sum and reset indirect light pass variables /* for render passes, sum and reset indirect light pass variables

3
intern/cycles/kernel/kernel_path_volume.h
View File

@@ -58,8 +58,7 @@ ccl_device void kernel_path_volume_connect_light(KernelGlobals *kg, RNG *rng,
} }
ccl_device bool kernel_path_volume_bounce(KernelGlobals *kg, RNG *rng, ccl_device bool kernel_path_volume_bounce(KernelGlobals *kg, RNG *rng,
ShaderData *sd, float3 *throughput, PathState *state, PathRadiance *L, Ray *ray, ShaderData *sd, float3 *throughput, PathState *state, PathRadiance *L, Ray *ray)
float num_samples_adjust)
{ {
/* sample phase function */ /* sample phase function */
float phase_pdf; float phase_pdf;