diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/CL/cl_kernels/scale.cl | 20 | ||||
| -rw-r--r-- | src/core/CL/kernels/CLScaleKernel.cpp | 7 |
2 files changed, 15 insertions, 12 deletions
diff --git a/src/core/CL/cl_kernels/scale.cl b/src/core/CL/cl_kernels/scale.cl index b3398bd11c..0106ce095c 100644 --- a/src/core/CL/cl_kernels/scale.cl +++ b/src/core/CL/cl_kernels/scale.cl @@ -70,20 +70,20 @@ inline const float8 transform_bilinear(const float2 coord, const float2 scale) * @param[in] out_offset_first_element_in_bytes The offset of the first element in the destination image * @param[in] input_width Input image width * @param[in] input_height Input image height - * @param[in] output_width Output image width - * @param[in] output_height Output image height + * @param[in] scale_x The scale factor along x dimension + * @param[in] scale_y The scale factor along y dimension */ __kernel void scale_nearest_neighbour( IMAGE_DECLARATION(in), IMAGE_DECLARATION(out), const float input_width, const float input_height, - const float output_width, - const float output_height) + const float scale_x, + const float scale_y) { Image in = CONVERT_TO_IMAGE_STRUCT_NO_STEP(in); Image out = CONVERT_TO_IMAGE_STRUCT(out); - const float2 r = (float2)(input_width / output_width, input_height / output_height); + const float2 r = (float2)(scale_x, scale_y); const float8 tc = clamp_to_border(transform_nearest(get_current_coords(), r), input_width, input_height); vstore4(read_texels4(&in, convert_int8(tc)), 0, (__global DATA_TYPE *)out.ptr); } @@ -104,20 +104,20 @@ __kernel void scale_nearest_neighbour( * @param[in] out_offset_first_element_in_bytes The offset of the first element in the destination image * @param[in] input_width Input image width * @param[in] input_height Input image height - * @param[in] output_width Output image width - * @param[in] output_height Output image height + * @param[in] scale_x The scale factor along x dimension + * @param[in] scale_y The scale factor along y dimension */ __kernel void scale_bilinear( IMAGE_DECLARATION(in), IMAGE_DECLARATION(out), const float input_width, const float input_height, - const float output_width, - const float output_height) + const float scale_x, + const float scale_y) { Image in = CONVERT_TO_IMAGE_STRUCT_NO_STEP(in); Image out = CONVERT_TO_IMAGE_STRUCT(out); - const float2 r = (float2)(input_width / output_width, input_height / output_height); + const float2 r = (float2)(scale_x, scale_y); const float8 tc = transform_bilinear(get_current_coords(), r); vstore4(bilinear_interpolate(&in, tc, input_width, input_height), 0, (__global DATA_TYPE *)out.ptr); } diff --git a/src/core/CL/kernels/CLScaleKernel.cpp b/src/core/CL/kernels/CLScaleKernel.cpp index 66afc3db60..82ebe644ea 100644 --- a/src/core/CL/kernels/CLScaleKernel.cpp +++ b/src/core/CL/kernels/CLScaleKernel.cpp @@ -98,9 +98,12 @@ void CLScaleKernel::configure(const ICLTensor *input, ICLTensor *output, Interpo ICLKernel::configure(win); // Set static kernel arguments + const float scale_x = static_cast<float>(input->info()->dimension(0)) / output->info()->dimension(0); + const float scale_y = static_cast<float>(input->info()->dimension(1)) / output->info()->dimension(1); + unsigned int idx = 2 * num_arguments_per_2D_tensor(); //Skip the input and output parameters _kernel.setArg<float>(idx++, input->info()->dimension(0)); _kernel.setArg<float>(idx++, input->info()->dimension(1)); - _kernel.setArg<float>(idx++, output->info()->dimension(0)); - _kernel.setArg<float>(idx++, output->info()->dimension(1)); + _kernel.setArg<float>(idx++, scale_x); + _kernel.setArg<float>(idx++, scale_y); } |