diff options
Diffstat (limited to 'intern/cycles/device/opencl/opencl_base.cpp')
| -rw-r--r-- | intern/cycles/device/opencl/opencl_base.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/intern/cycles/device/opencl/opencl_base.cpp b/intern/cycles/device/opencl/opencl_base.cpp index 4e49e0ef166..50d371e4c55 100644 --- a/intern/cycles/device/opencl/opencl_base.cpp +++ b/intern/cycles/device/opencl/opencl_base.cpp @@ -246,7 +246,7 @@ bool OpenCLDeviceBase::load_kernels(const DeviceRequestedFeatures& requested_fea denoising_program.add_kernel(ustring("filter_nlm_normalize")); denoising_program.add_kernel(ustring("filter_nlm_construct_gramian")); denoising_program.add_kernel(ustring("filter_finalize")); - denoising_program.add_kernel(ustring("filter_set_tiles")); + denoising_program.add_kernel(ustring("filter_set_tile_info")); vector<OpenCLProgram*> programs; programs.push_back(&base_program); @@ -977,13 +977,13 @@ bool OpenCLDeviceBase::denoising_divide_shadow(device_ptr a_ptr, cl_mem sv_variance_mem = CL_MEM_PTR(sv_variance_ptr); cl_mem buffer_variance_mem = CL_MEM_PTR(buffer_variance_ptr); - cl_mem tiles_mem = CL_MEM_PTR(task->tiles_mem.device_pointer); + cl_mem tile_info_mem = CL_MEM_PTR(task->tile_info_mem.device_pointer); cl_kernel ckFilterDivideShadow = denoising_program(ustring("filter_divide_shadow")); kernel_set_args(ckFilterDivideShadow, 0, task->render_buffer.samples, - tiles_mem, + tile_info_mem, a_mem, b_mem, sample_variance_mem, @@ -1008,13 +1008,13 @@ bool OpenCLDeviceBase::denoising_get_feature(int mean_offset, cl_mem mean_mem = CL_MEM_PTR(mean_ptr); cl_mem variance_mem = CL_MEM_PTR(variance_ptr); - cl_mem tiles_mem = CL_MEM_PTR(task->tiles_mem.device_pointer); + cl_mem tile_info_mem = CL_MEM_PTR(task->tile_info_mem.device_pointer); cl_kernel ckFilterGetFeature = denoising_program(ustring("filter_get_feature")); kernel_set_args(ckFilterGetFeature, 0, task->render_buffer.samples, - tiles_mem, + tile_info_mem, mean_offset, variance_offset, mean_mem, @@ -1056,29 +1056,29 @@ bool OpenCLDeviceBase::denoising_detect_outliers(device_ptr image_ptr, return true; } -bool OpenCLDeviceBase::denoising_set_tiles(device_ptr *buffers, - DenoisingTask *task) +bool OpenCLDeviceBase::denoising_set_tile_info(device_ptr *buffers, + DenoisingTask *task) { - task->tiles_mem.copy_to_device(); + task->tile_info_mem.copy_to_device(); - cl_mem tiles_mem = CL_MEM_PTR(task->tiles_mem.device_pointer); + cl_mem tile_info_mem = CL_MEM_PTR(task->tile_info_mem.device_pointer); - cl_kernel ckFilterSetTiles = denoising_program(ustring("filter_set_tiles")); + cl_kernel ckFilterSetTileInfo = denoising_program(ustring("filter_set_tile_info")); - kernel_set_args(ckFilterSetTiles, 0, tiles_mem); + kernel_set_args(ckFilterSetTileInfo, 0, tile_info_mem); for(int i = 0; i < 9; i++) { cl_mem buffer_mem = CL_MEM_PTR(buffers[i]); - kernel_set_args(ckFilterSetTiles, i+1, buffer_mem); + kernel_set_args(ckFilterSetTileInfo, i+1, buffer_mem); } - enqueue_kernel(ckFilterSetTiles, 1, 1); + enqueue_kernel(ckFilterSetTileInfo, 1, 1); return true; } void OpenCLDeviceBase::denoise(RenderTile &rtile, DenoisingTask& denoising) { - denoising.functions.set_tiles = function_bind(&OpenCLDeviceBase::denoising_set_tiles, this, _1, &denoising); + denoising.functions.set_tile_info = function_bind(&OpenCLDeviceBase::denoising_set_tile_info, this, _1, &denoising); denoising.functions.construct_transform = function_bind(&OpenCLDeviceBase::denoising_construct_transform, this, &denoising); denoising.functions.reconstruct = function_bind(&OpenCLDeviceBase::denoising_reconstruct, this, _1, _2, _3, &denoising); denoising.functions.divide_shadow = function_bind(&OpenCLDeviceBase::denoising_divide_shadow, this, _1, _2, _3, _4, _5, &denoising); |