[Bf-blender-cvs] [c3f2257] cycles_kernel_split: Modify split-kernel's path-trace function signature

varunsundar08 noreply at git.blender.org
Tue May 5 20:05:54 CEST 2015


Commit: c3f22575df3ab46e630be72f23cd2ef39160af20
Author: varunsundar08
Date:   Tue May 5 21:06:17 2015 +0530
Branches: cycles_kernel_split
https://developer.blender.org/rBc3f22575df3ab46e630be72f23cd2ef39160af20

Modify split-kernel's path-trace function signature

===================================================================

M	intern/cycles/device/device_opencl.cpp

===================================================================

diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 3233136..6a5e216 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -2493,7 +2493,7 @@ public:
 			clReleaseProgram(sumAllRadiance_program);
 	}
 
-	void path_trace(RenderTile& rtile, int /*sample*/)
+	void path_trace(RenderTile& rtile)
 	{
 		/* cast arguments to cl types */
 		cl_mem d_data = CL_MEM_PTR(const_mem_map["__data"]->device_pointer);
@@ -3523,7 +3523,7 @@ The current tile of dimensions %dx%d is split into tiles of dimension %dx%d for
 						/* Set max_render_feasible_render_tile_size for all tiles */
 						to_path_trace_render_tiles[tile_iter].max_render_feasible_tile_size = max_render_feasible_tile_size;
 						/* The second argument is dummy */
-						path_trace(to_path_trace_render_tiles[tile_iter], 0);
+						path_trace(to_path_trace_render_tiles[tile_iter]);
 					}
 				}
 				else {
@@ -3534,7 +3534,7 @@ The current tile of dimensions %dx%d is split into tiles of dimension %dx%d for
 					/* buffer_rng_state_stride is stride itself */
 					tile.buffer_rng_state_stride = tile.stride;
 					/* The second argument is dummy */
-					path_trace(tile, 0);
+					path_trace(tile);
 				}
 				tile.sample = tile.start_sample + tile.num_samples;




More information about the Bf-blender-cvs mailing list