Commit: dc9e0b819b814bbbbb38d4238c2fec21d9092437
Author: Sergey Sharybin
Date: Sun Nov 1 16:51:32 2015 +0500
Branches: master
https://developer.blender.org/rBdc9e0b819b814bbbbb38d4238c2fec21d9092437
Cycles: Remove unused argument from the split kernel functions
Should be no functional changes, just simplifies operation with kernels.
===================================================================
M intern/cycles/device/device_opencl.cpp
M intern/cycles/kernel/kernels/opencl/kernel_background_buffer_update.cl
M intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl
M
intern/cycles/kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl
M intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl
M intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl
M intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl
M intern/cycles/kernel/kernels/opencl/kernel_shader_eval.cl
M intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl
M intern/cycles/kernel/kernels/opencl/kernel_sum_all_radiance.cl
M intern/cycles/kernel/split/kernel_background_buffer_update.h
M intern/cycles/kernel/split/kernel_direct_lighting.h
M
intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
M intern/cycles/kernel/split/kernel_lamp_emission.h
M intern/cycles/kernel/split/kernel_next_iteration_setup.h
M intern/cycles/kernel/split/kernel_scene_intersect.h
M intern/cycles/kernel/split/kernel_shader_eval.h
M intern/cycles/kernel/split/kernel_shadow_blocked.h
M intern/cycles/kernel/split/kernel_sum_all_radiance.h
===================================================================
diff --git a/intern/cycles/device/device_opencl.cpp
b/intern/cycles/device/device_opencl.cpp
index d6b1ab3..b4fc41a 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -2843,7 +2843,6 @@ public:
kernel_set_args(ckPathTraceKernel_scene_intersect,
0,
kgbuffer,
- d_data,
rng_coop,
Ray_coop,
PathState_coop,
@@ -2863,7 +2862,6 @@ public:
kernel_set_args(ckPathTraceKernel_lamp_emission,
0,
kgbuffer,
- d_data,
sd,
throughput_coop,
PathRadiance_coop,
@@ -2889,7 +2887,6 @@ public:
kernel_set_args(ckPathTraceKernel_background_buffer_update,
0,
kgbuffer,
- d_data,
sd,
per_sample_output_buffers,
d_rng_state,
@@ -2926,7 +2923,6 @@ public:
kernel_set_args(ckPathTraceKernel_shader_eval,
0,
kgbuffer,
- d_data,
sd,
rng_coop,
Ray_coop,
@@ -2940,7 +2936,6 @@ public:
kernel_set_args(ckPathTraceKernel_holdout_emission_blurring_pathtermination_ao,
0,
kgbuffer,
- d_data,
sd,
per_sample_output_buffers,
rng_coop,
@@ -2970,7 +2965,6 @@ public:
kernel_set_args(ckPathTraceKernel_direct_lighting,
0,
kgbuffer,
- d_data,
sd,
sd_DL_shadow,
rng_coop,
@@ -2986,7 +2980,6 @@ public:
kernel_set_args(ckPathTraceKernel_shadow_blocked,
0,
kgbuffer,
- d_data,
sd_DL_shadow,
PathState_coop,
LightRay_coop,
@@ -3002,7 +2995,6 @@ public:
kernel_set_args(ckPathTraceKernel_next_iteration_setup,
0,
kgbuffer,
- d_data,
sd,
rng_coop,
throughput_coop,
@@ -3023,7 +3015,7 @@ public:
kernel_set_args(ckPathTraceKernel_sum_all_radiance,
0,
- d_data,
+ kgbuffer,
d_buffer,
per_sample_output_buffers,
num_parallel_samples,
diff --git
a/intern/cycles/kernel/kernels/opencl/kernel_background_buffer_update.cl
b/intern/cycles/kernel/kernels/opencl/kernel_background_buffer_update.cl
index c5eb7a2..c28338b 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel_background_buffer_update.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel_background_buffer_update.cl
@@ -18,7 +18,6 @@
__kernel void kernel_ocl_path_trace_background_buffer_update(
ccl_global char *kg,
- ccl_constant KernelData *data,
ccl_global char *sd,
ccl_global float *per_sample_output_buffers,
ccl_global uint *rng_state,
@@ -84,7 +83,6 @@ __kernel void kernel_ocl_path_trace_background_buffer_update(
#endif
enqueue_flag =
kernel_background_buffer_update((KernelGlobals *)kg,
- data,
(ShaderData *)sd,
per_sample_output_buffers,
rng_state,
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl
b/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl
index d23e87e..a646d42 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl
@@ -18,7 +18,6 @@
__kernel void kernel_ocl_path_trace_direct_lighting(
ccl_global char *kg,
- ccl_constant KernelData *data,
ccl_global char *sd, /* Required for direct
lighting */
ccl_global char *sd_DL, /* Required for direct
lighting */
ccl_global uint *rng_coop, /* Required for direct
lighting */
@@ -62,7 +61,6 @@ __kernel void kernel_ocl_path_trace_direct_lighting(
if(ray_index != QUEUE_EMPTY_SLOT) {
#endif
enqueue_flag = kernel_direct_lighting((KernelGlobals *)kg,
- data,
(ShaderData *)sd,
(ShaderData *)sd_DL,
rng_coop,
diff --git
a/intern/cycles/kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl
b/intern/cycles/kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl
index 6fe25d7..2f6d3e2 100644
---
a/intern/cycles/kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl
+++
b/intern/cycles/kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl
@@ -18,7 +18,6 @@
__kernel void
kernel_ocl_path_trace_holdout_emission_blurring_pathtermination_ao(
ccl_global char *kg,
- ccl_constant KernelData *data,
ccl_global char *sd, /* Required throughout the
kernel except probabilistic path termination and AO */
ccl_global float *per_sample_output_buffers,
ccl_global uint *rng_coop, /* Required for
"kernel_write_data_passes" and AO */
@@ -76,7 +75,6 @@ __kernel void
kernel_ocl_path_trace_holdout_emission_blurring_pathtermination_ao
#endif
kernel_holdout_emission_blurring_pathtermination_ao(
(KernelGlobals *)kg,
- data,
(ShaderData *)sd,
per_sample_output_buffers,
rng_coop,
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl
b/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl
index feee4b7..73de387 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl
@@ -18,7 +18,6 @@
__kernel void kernel_ocl_path_trace_lamp_emission(
ccl_global char *kg,
- ccl_constant KernelData *data,
ccl_global char *sd, /* Required for lamp emission */
ccl_global float3 *throughput_coop, /* Required for lamp emission */
PathRadiance *PathRadiance_coop, /* Required for lamp emission */
@@ -69,7 +68,6 @@ __kernel void kernel_ocl_path_trace_lamp_emission(
}
kernel_lamp_emission((KernelGlobals *)kg,
- data,
(ShaderData *)sd,
throughput_coop,
PathRadiance_coop,
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl
b/intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl
index 8896fe7..f6962aa 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl
@@ -18,7 +18,6 @@
__kernel void kernel_ocl_path_trace_next_iteration_setup(
ccl_global char *kg,
- ccl_constant KernelData *data,
ccl_global char *sd, /* Required for setting up ray
for next iteration */
ccl_global uint *rng_coop, /* Required for setting up ray
for next iteration */
ccl_global float3 *throughput_coop, /* Required for setting up ray
for next iteration */
@@ -84,7 +83,6 @@ __kernel void kernel_ocl_path_trace_next_iteration_setup(
if(ray_index != QUEUE_EMPTY_SLOT) {
#endif
enqueue_flag = kernel_next_iteration_setup((KernelGlobals *)kg,
- data,
(ShaderData *)sd,
rng_coop,
throughput_coop,
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl
b/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl
index c9bbd65..c117008 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl
@@ -18,7 +18,6 @@
__kernel void kernel_ocl_path_trace_scene_intersect(
ccl_global char *kg,
- ccl_constant KernelData *data,
ccl_global uint *rng_coop,
ccl_global Ray *Ray_coop, /* Required for scene_intersect
*/
ccl_global PathState *PathState_coop, /* Required for scene_intersect
*/
@@ -66,7 +65,6 @@ __kernel void kernel_ocl_path_trace_scene_intersect(
}
kernel_scene_intersect((KernelGlobals *)kg,
- data,
rng_coop,
Ray_coop,
PathState_coop,
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_shader_eval.cl
b/intern/cycles/kernel/kernels/opencl/kernel_shader_eval.cl
index 2fa5496..6f9faf5 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel_shader_eval.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel_shader_eval.cl
@@ -18,7 +18,6 @@
__kernel void kernel_ocl_path_trace_shader_eval(
ccl_global char *kg,
- ccl_constant KernelData *data,
ccl_global char *sd, /* Output ShaderData structure
to be filled */
ccl_global uint *rng_coop, /* Required for rbsdf
calculation */
ccl_global Ray *Ray_coop, /* Required for setting up
shader from ray */
@@ -58,7 +57,6 @@ __kernel void kernel_ocl_path_trace_shader_eval(
/* Continue on with shader evaluation. */
kernel_shader_eval((KernelGlobals *)kg,
- data,
(ShaderData *)sd,
rng_coop,
Ray_coop,
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl
b/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl
index b364c76..b2ee6d2 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl
@@ -18,7 +18,6 @@
__kernel void kernel_ocl_p
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
