From patchwork Thu May 27 10:55:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 12448 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 E8DF2C3203 for ; Thu, 27 May 2021 10:55:30 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2F493602AD; Thu, 27 May 2021 12:55:29 +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="G1KipA81"; dkim-atps=neutral Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4C5F1602AA for ; Thu, 27 May 2021 12:55:26 +0200 (CEST) Received: by mail-lf1-x134.google.com with SMTP id a2so7328950lfc.9 for ; Thu, 27 May 2021 03:55:26 -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=1pJOzZy0cA+5PFPsdwnYX3JXmgdw7xElcszVRkfrj+Q=; b=G1KipA815odUSHkrusrLl7MC5/MvtmFW6OiIkYmHq5xOPp0f03i+2v8NfgLLbQEiRT 79o/DYQBl/bCXrBUvDcSH4DcrlQFUXKNkVQ72YFjziFbY//ZznoVksTfVwGDE8CLTNIZ tQi5BlUwARPfXOqkjMfOx37xy5iQwTIl0l8lVBo/14qkpZ04ewVqkB9iODVKZ6+uXm3r YCD79f05foO6y5A3Enx9Ujtbv0ZBI5NS3CJSGQ4yxAK9t8qw/HhPFnCqMzQl+0MDx3Cz 02+/ALg907acSVq9LCG98ZhzggOfCjNsomgjvhVyEyOR1J6U2yXWZfDynW5cLAsAq3sz dxSQ== 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=1pJOzZy0cA+5PFPsdwnYX3JXmgdw7xElcszVRkfrj+Q=; b=fLzsiaafRs38jy+9YQRXdc4pDbta9Blhmfdo622trZJk1koZ/eBXIStT8otWkVPeqM /4yC5ICGxMEncjY8rDofjFbz3cLPvjs32PAAPYYx+HgAAXfwAEN865aU1VlIJCAYOEoO 3cpL+GHF0L8C32/rfm8WR9T5c4eHqf3y95S7s6PPNCNE5jg/h3YKkF+8HsLuQVu0S1An JfIodHwXK5OJqJF4dbVHDSL67V1DSssI6wYna1cveHQ3TM8EsGqhqYGg9LyZiDefy9DH bAl5LDetccWfC9TKkkZgMX4WEpR64XGR6oLZGxoOXjvE2BQ4Hyphid/1gfNsD4Ff9B8p oiOA== X-Gm-Message-State: AOAM5308/x0qWRpRU/qGzYfEn1pL63IZouqsLD6iCNoXWJsrdYwzxxh6 nChaavnWCrLCCPf8PAJo2NlrEUPOPHJgcg== X-Google-Smtp-Source: ABdhPJx/Bl56fm8igrtOJI5+jHzYQ3gbAOoQtG2UNEsnYctsOTiFNhrv47p0ThZdEJtgglXeLec7aw== X-Received: by 2002:ac2:5a45:: with SMTP id r5mr2095818lfn.342.1622112925584; Thu, 27 May 2021 03:55:25 -0700 (PDT) Received: from localhost.localdomain ([85.249.41.56]) by smtp.googlemail.com with ESMTPSA id h23sm170148lfc.52.2021.05.27.03.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 03:55:25 -0700 (PDT) From: Andrey Konovalov To: libcamera-devel@lists.libcamera.org, laurent.pinchart@ideasonboard.com Date: Thu, 27 May 2021 13:55:07 +0300 Message-Id: <20210527105511.447089-2-andrey.konovalov@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210527105511.447089-1-andrey.konovalov@linaro.org> References: <20210527105511.447089-1-andrey.konovalov@linaro.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 1/5] 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_;