From 1bfc7849950b67aeee382b08f27fd0b1b5ef0587 Mon Sep 17 00:00:00 2001 From: Frank Lei Date: Thu, 4 Jan 2018 13:02:40 +0800 Subject: APPBROWSER-376: Work around for scale validation error. Use "vec2 scale" instead of scale_x/scale_y to work around this issue. Change-Id: Ieae55327596fdb853d7b625262fec3a3a84f577c Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/115143 Reviewed-by: Joel Liang Reviewed-by: Pablo Tello Tested-by: Jenkins Reviewed-by: Frank Lei Reviewed-by: Anthony Barbier --- src/core/GLES_COMPUTE/kernels/GCScaleKernel.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/core/GLES_COMPUTE/kernels') diff --git a/src/core/GLES_COMPUTE/kernels/GCScaleKernel.cpp b/src/core/GLES_COMPUTE/kernels/GCScaleKernel.cpp index 7461c544da..f307cfb239 100644 --- a/src/core/GLES_COMPUTE/kernels/GCScaleKernel.cpp +++ b/src/core/GLES_COMPUTE/kernels/GCScaleKernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017 ARM Limited. + * Copyright (c) 2016, 2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -128,13 +128,9 @@ void GCScaleKernel::configure(const IGCTensor *input, IGCTensor *output, Interpo IGCKernel::configure(win); - // Set static kernel arguments - const float scale_x = static_cast(input->info()->dimension(0)) / output->info()->dimension(0); - const float scale_y = static_cast(input->info()->dimension(1)) / output->info()->dimension(1); - unsigned int idx = 2 * num_arguments_per_2D_tensor(); //Skip the tensor parameters _kernel.set_argument(idx++, static_cast(input->info()->dimension(0))); _kernel.set_argument(idx++, static_cast(input->info()->dimension(1))); - _kernel.set_argument(idx++, scale_x); - _kernel.set_argument(idx++, scale_y); + _kernel.set_argument(idx++, wr); + _kernel.set_argument(idx++, hr); } -- cgit v1.2.1