From patchwork Fri Jun 11 16:27:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 12573 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id B4AAEC320B for ; Fri, 11 Jun 2021 16:27:44 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 74AFF6892B; Fri, 11 Jun 2021 18:27:44 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="ZoXwmaoX"; dkim-atps=neutral Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 90A346029E for ; Fri, 11 Jun 2021 18:27:42 +0200 (CEST) Received: by mail-lf1-x132.google.com with SMTP id k40so9391536lfv.7 for ; Fri, 11 Jun 2021 09:27:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mv2rnIZBXYiZJVAJqcAZOvGmMppMCyKTu4OnVWYQArQ=; b=ZoXwmaoXJkGWewFylxgg/7CBUyLiE2pp8ZGpBtQymJWcvMgLfyzm7hcAsNMG7dA1Qi /Yiw/nq3j+x9Tapk6xOr5AVbW7xkvdUd2iwXe724u6Ck5XcUaQML3dBdSfz4vCLZFC93 X8rVB4V6gEsVGjfwXLdNuh4m6Uw9wjU4bR7gcjYtC0420movYWy+DhTIvGQp/UL8fmXI Y7qFIe2Zg+JTXUEGim4MAF/FxlwUCvb2AhxIbqIRlDm0qNqOvdoa22So7QTC3nFuo9iD yd/QPVsyYkjPcoRJ8y1/hebrGvNSUjKysAx/Zl4WIeuNGcd1SAJhDjBykDSEb2HRTmP6 xQEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mv2rnIZBXYiZJVAJqcAZOvGmMppMCyKTu4OnVWYQArQ=; b=LTYutRQvAMsM2ZzhKn1MIhbSXirS1ZKCPC1I5Ac4OLaGmMbPNjYhVDytSqiSKt8VVX odYxBTLvjBOGR9Sf2IteC1sanqhY5B490qNLeVa3/Rl4xGoalboQ/t+wAe/2FPtmqsD7 z+nBxY86gZ3yYGu+4JF1NCVjtxNRhSbPEX1J/jUmyKp/erOoD0YccoyE5AQB7Jxesf3b qt5Jmhw/YWeGschQQJV9Eu76mSFY409OF1kCckVSsED6HDfNHgJMaSwEJ8DcdCfSXF7C PgBQBmmFzd1SxVHg4u3dezWIT3FkRxy8XoPdSN2mtZ+a9CkCCDfnqmZaLE5fYo9cEKOE cnuw== X-Gm-Message-State: AOAM5305sRLHFzvX9dYkxxkwkB1n948931VfpmAa0lZg5YDfFGwtGdXE 5q6dThydSwatp6zRd2IN5uE6yeyBhuUSPQ== X-Google-Smtp-Source: ABdhPJwet9CBnhvKAjuWLdrYkB6HPBBL8ZD2TkthBQIOyR3tbssx2X2wDRIccT0xDnX/ErlDJiJ9zQ== X-Received: by 2002:a19:c347:: with SMTP id t68mr3100033lff.653.1623428862060; Fri, 11 Jun 2021 09:27:42 -0700 (PDT) Received: from localhost.localdomain ([85.249.44.185]) by smtp.googlemail.com with ESMTPSA id l2sm777773lji.70.2021.06.11.09.27.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 09:27:41 -0700 (PDT) From: Andrey Konovalov To: libcamera-devel@lists.libcamera.org, laurent.pinchart@ideasonboard.com Date: Fri, 11 Jun 2021 19:27:23 +0300 Message-Id: <20210611162726.824789-2-andrey.konovalov@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611162726.824789-1-andrey.konovalov@linaro.org> References: <20210611162726.824789-1-andrey.konovalov@linaro.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 1/4] qcam: viewfinder_gl: change uniform float tex_stepx to vec2 tex_step X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: morgan@casual-effects.com Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" In preparation to extend the supported formats, extend the tex_stepx uniform to cover the steps between texels in both horizontal and vertical directions. Signed-off-by: Andrey Konovalov Reviewed-by: Laurent Pinchart --- src/qcam/assets/shader/YUV_packed.frag | 8 ++++---- src/qcam/viewfinder_gl.cpp | 7 ++++--- src/qcam/viewfinder_gl.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/qcam/assets/shader/YUV_packed.frag b/src/qcam/assets/shader/YUV_packed.frag index 224dfafe..d6efd4ce 100644 --- a/src/qcam/assets/shader/YUV_packed.frag +++ b/src/qcam/assets/shader/YUV_packed.frag @@ -12,7 +12,7 @@ precision mediump float; varying vec2 textureOut; uniform sampler2D tex_y; -uniform float tex_stepx; +uniform vec2 tex_step; void main(void) { @@ -49,10 +49,10 @@ void main(void) * a = fract(x) * 2 - 1 if fract(x) >= 0.5 */ vec2 pos = textureOut; - float f_x = fract(pos.x / tex_stepx); + float f_x = fract(pos.x / tex_step.x); - vec4 left = texture2D(tex_y, vec2(pos.x - f_x * tex_stepx, pos.y)); - vec4 right = texture2D(tex_y, vec2(pos.x + (1.0 - f_x) * tex_stepx , pos.y)); + vec4 left = texture2D(tex_y, vec2(pos.x - f_x * tex_step.x, pos.y)); + vec4 right = texture2D(tex_y, vec2(pos.x + (1.0 - f_x) * tex_step.x , pos.y)); #if defined(YUV_PATTERN_UYVY) float y_left = mix(left.g, left.a, f_x * 2.0); diff --git a/src/qcam/viewfinder_gl.cpp b/src/qcam/viewfinder_gl.cpp index 5d9b442e..ff719418 100644 --- a/src/qcam/viewfinder_gl.cpp +++ b/src/qcam/viewfinder_gl.cpp @@ -289,7 +289,7 @@ bool ViewFinderGL::createFragmentShader() textureUniformY_ = shaderProgram_.uniformLocation("tex_y"); textureUniformU_ = shaderProgram_.uniformLocation("tex_u"); textureUniformV_ = shaderProgram_.uniformLocation("tex_v"); - textureUniformStepX_ = shaderProgram_.uniformLocation("tex_stepx"); + textureUniformStep_ = shaderProgram_.uniformLocation("tex_step"); /* Create the textures. */ for (std::unique_ptr &texture : textures_) { @@ -508,8 +508,9 @@ void ViewFinderGL::doRender() * ([0, 1]). There are exactly width - 1 steps between the * leftmost and rightmost texels. */ - shaderProgram_.setUniformValue(textureUniformStepX_, - 1.0f / (size_.width() / 2 - 1)); + shaderProgram_.setUniformValue(textureUniformStep_, + 1.0f / (size_.width() / 2 - 1), + 1.0f /* not used */); break; case libcamera::formats::ABGR8888: diff --git a/src/qcam/viewfinder_gl.h b/src/qcam/viewfinder_gl.h index 150fa4ae..1b1faa91 100644 --- a/src/qcam/viewfinder_gl.h +++ b/src/qcam/viewfinder_gl.h @@ -85,7 +85,7 @@ private: GLuint textureUniformU_; GLuint textureUniformV_; GLuint textureUniformY_; - GLuint textureUniformStepX_; + GLuint textureUniformStep_; unsigned int horzSubSample_; unsigned int vertSubSample_;