From 9bce104c8c72cdd4deac8e59ce571892302fb366 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sun, 1 Nov 2015 21:00:26 +0500 Subject: Cycles: Partially revert previous commit Apparently removing kernel arguments broke NVidia OpenCL. Needs more investigation, for the time being revering changes which caused problem. --- intern/cycles/device/device_opencl.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'intern/cycles/device/device_opencl.cpp') diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index b4fc41ab247..d6b1ab38bd0 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -2843,6 +2843,7 @@ public: kernel_set_args(ckPathTraceKernel_scene_intersect, 0, kgbuffer, + d_data, rng_coop, Ray_coop, PathState_coop, @@ -2862,6 +2863,7 @@ public: kernel_set_args(ckPathTraceKernel_lamp_emission, 0, kgbuffer, + d_data, sd, throughput_coop, PathRadiance_coop, @@ -2887,6 +2889,7 @@ public: kernel_set_args(ckPathTraceKernel_background_buffer_update, 0, kgbuffer, + d_data, sd, per_sample_output_buffers, d_rng_state, @@ -2923,6 +2926,7 @@ public: kernel_set_args(ckPathTraceKernel_shader_eval, 0, kgbuffer, + d_data, sd, rng_coop, Ray_coop, @@ -2936,6 +2940,7 @@ public: kernel_set_args(ckPathTraceKernel_holdout_emission_blurring_pathtermination_ao, 0, kgbuffer, + d_data, sd, per_sample_output_buffers, rng_coop, @@ -2965,6 +2970,7 @@ public: kernel_set_args(ckPathTraceKernel_direct_lighting, 0, kgbuffer, + d_data, sd, sd_DL_shadow, rng_coop, @@ -2980,6 +2986,7 @@ public: kernel_set_args(ckPathTraceKernel_shadow_blocked, 0, kgbuffer, + d_data, sd_DL_shadow, PathState_coop, LightRay_coop, @@ -2995,6 +3002,7 @@ public: kernel_set_args(ckPathTraceKernel_next_iteration_setup, 0, kgbuffer, + d_data, sd, rng_coop, throughput_coop, @@ -3015,7 +3023,7 @@ public: kernel_set_args(ckPathTraceKernel_sum_all_radiance, 0, - kgbuffer, + d_data, d_buffer, per_sample_output_buffers, num_parallel_samples, -- cgit v1.2.3