Cleanup: Remove unused variable in kernel_path_volume_bounce().
authorThomas Dinges <blender@dingto.org>
Sun, 24 Aug 2014 21:06:30 +0000 (23:06 +0200)
committerThomas Dinges <blender@dingto.org>
Sun, 24 Aug 2014 21:06:30 +0000 (23:06 +0200)
intern/cycles/kernel/kernel_path.h
intern/cycles/kernel/kernel_path_volume.h

index 0c8b46289744ab9a55af321d06fdded5e77130c6..7af74a763c63de1e600222026d73d545adc56dab 100644 (file)
@@ -137,7 +137,7 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg, RNG *rng, Ray ray,
                                kernel_volume_decoupled_free(kg, &volume_segment);
 
                                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;
                                        else
                                                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);
 
                                        /* 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;
                                        else
                                                break;
@@ -524,7 +524,7 @@ ccl_device float4 kernel_path_integrate(KernelGlobals *kg, RNG *rng, int sample,
                                kernel_volume_decoupled_free(kg, &volume_segment);
 
                                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;
                                        else
                                                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);
 
                                        /* 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;
                                        else
                                                break;
@@ -866,7 +866,7 @@ ccl_device float4 kernel_branched_path_integrate(KernelGlobals *kg, RNG *rng, in
                                                
                                        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);
 
                                                /* 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 */
                                        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);
 
                                                /* for render passes, sum and reset indirect light pass variables
index 4d6bf47ef9e407624e0ce83bd7857b4a33c58e9d..9189e5c518d615ee9db56af2921c0dab6a0d351e 100644 (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,
-       ShaderData *sd, float3 *throughput, PathState *state, PathRadiance *L, Ray *ray,
-       float num_samples_adjust)
+       ShaderData *sd, float3 *throughput, PathState *state, PathRadiance *L, Ray *ray)
 {
        /* sample phase function */
        float phase_pdf;