diff options
Diffstat (limited to 'intern/cycles/kernel/kernels/opencl/filter.cl')
| -rw-r--r-- | intern/cycles/kernel/kernels/opencl/filter.cl | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/intern/cycles/kernel/kernels/opencl/filter.cl b/intern/cycles/kernel/kernels/opencl/filter.cl index d553ee6833c..3c75754fb39 100644 --- a/intern/cycles/kernel/kernels/opencl/filter.cl +++ b/intern/cycles/kernel/kernels/opencl/filter.cl @@ -23,7 +23,7 @@ /* kernels */ __kernel void kernel_ocl_filter_divide_shadow(int sample, - ccl_global TileInfo *tile_info, + CCL_FILTER_TILE_INFO, ccl_global float *unfilteredA, ccl_global float *unfilteredB, ccl_global float *sampleVariance, @@ -37,7 +37,7 @@ __kernel void kernel_ocl_filter_divide_shadow(int sample, int y = prefilter_rect.y + get_global_id(1); if(x < prefilter_rect.z && y < prefilter_rect.w) { kernel_filter_divide_shadow(sample, - tiles, + CCL_FILTER_TILE_INFO_ARG, x, y, unfilteredA, unfilteredB, @@ -51,7 +51,7 @@ __kernel void kernel_ocl_filter_divide_shadow(int sample, } __kernel void kernel_ocl_filter_get_feature(int sample, - ccl_global TileInfo *tile_info, + CCL_FILTER_TILE_INFO, int m_offset, int v_offset, ccl_global float *mean, @@ -64,7 +64,7 @@ __kernel void kernel_ocl_filter_get_feature(int sample, int y = prefilter_rect.y + get_global_id(1); if(x < prefilter_rect.z && y < prefilter_rect.w) { kernel_filter_get_feature(sample, - tiles, + CCL_FILTER_TILE_INFO_ARG, m_offset, v_offset, x, y, mean, variance, @@ -276,27 +276,3 @@ __kernel void kernel_ocl_filter_finalize(ccl_global float *buffer, buffer_params, sample); } } - -__kernel void kernel_ocl_filter_set_tile_info(ccl_global TileInfo* tile_info, - ccl_global float *buffer_1, - ccl_global float *buffer_2, - ccl_global float *buffer_3, - ccl_global float *buffer_4, - ccl_global float *buffer_5, - ccl_global float *buffer_6, - ccl_global float *buffer_7, - ccl_global float *buffer_8, - ccl_global float *buffer_9) -{ - if((get_global_id(0) == 0) && (get_global_id(1) == 0)) { - tile_info->buffers[0] = buffer_1; - tile_info->buffers[1] = buffer_2; - tile_info->buffers[2] = buffer_3; - tile_info->buffers[3] = buffer_4; - tile_info->buffers[4] = buffer_5; - tile_info->buffers[5] = buffer_6; - tile_info->buffers[6] = buffer_7; - tile_info->buffers[7] = buffer_8; - tile_info->buffers[8] = buffer_9; - } -} |