From patchwork Wed Jan 13 13:08:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10852 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 83109BD80C for ; Wed, 13 Jan 2021 13:08:54 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4ADCC680DB; Wed, 13 Jan 2021 14:08:54 +0100 (CET) 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="OEJYQuTp"; dkim-atps=neutral Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0BE3C6054E for ; Wed, 13 Jan 2021 14:08:53 +0100 (CET) Received: by mail-lj1-x235.google.com with SMTP id u11so2425064ljo.13 for ; Wed, 13 Jan 2021 05:08:53 -0800 (PST) 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; bh=olzp5+f2p8vLdXof0aF2IDvl6Y/vw19jdOA72WR6mWo=; b=OEJYQuTp2GKc0FdKoPLu3wTSzulGLN6ZwhCGcaK1I4j+EnHehdHkYVl76S8mGqWeIu lurLj5u6J9vrlTMV69fWFWLzqMze9QHvd0xmIVJd70rwVLQouR6TCadAJ8x71aXsaVNU /BEeHnd8p5A1bavz/O/FQlCU7Mb4abzfiNoGuUwcAOCplB1SdKt+lw+K73w+wy5iqzb0 nluhMV3w2kICTyIg1eC2+bYM+w4XOyJqFrQ6O9CoJdFOF0XpmKEZ+oO0Bg13qAdnYDPu +CkiqHiDHvXYfss0ucD5OP6jRPYZBz4GOc+ffiGY4lwWvOtS47awuw9OBs4Y8I6oP1j0 l+qQ== 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; bh=olzp5+f2p8vLdXof0aF2IDvl6Y/vw19jdOA72WR6mWo=; b=bbFZWNxcRGVMpd8xXqIapJ5wnTJgWh7gHpMJMrmY7nQM5AMs2tq8gN9F1yR2PAIU0G x/GS6qNFJUL8zHKgBusvFaZUqP07jvEqDbrM7uXYs6HDWC82BSisTgyqWuy8ry5Zwh0n a9ym4nuLN79sjTrzcDWXJTH9W02qfjovDPIR0ip5fTmrW1l58w0TdKigdaZiCE3s4DVS qZZB+IKTMOkTNR7citrFhPa/5fMxvEoLlTIfWyEIPx4zwdW42y5cMNsawCZj06q+szy/ yfd6NXxAPFPVTkr4W2HGDk2Gf041wPHlqm/fUspIOh8TzECaeT+TX2ZqwOywEMda5s99 dLIQ== X-Gm-Message-State: AOAM530bVpllbJR/FtdxlIJr81USja93aWgi1eJYEewcI8QVIKO4RoAS nPXq12y3VWOnEKfWGrOc+zSQL9g4crbqLg== X-Google-Smtp-Source: ABdhPJyw2pOq2YHUOdOnffBEOzr50QW8UUlxFpFBjHQ0pzhxvx7nRDqBsL9ZwRo9JWzhkAEtdan/IQ== X-Received: by 2002:a05:651c:118b:: with SMTP id w11mr895257ljo.402.1610543332045; Wed, 13 Jan 2021 05:08:52 -0800 (PST) Received: from localhost.localdomain ([85.249.43.69]) by smtp.googlemail.com with ESMTPSA id d2sm179477ljg.39.2021.01.13.05.08.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jan 2021 05:08:51 -0800 (PST) From: Andrey Konovalov To: libcamera-devel@lists.libcamera.org, laurent.pinchart@ideasonboard.com Date: Wed, 13 Jan 2021 16:08:29 +0300 Message-Id: <20210113130832.15549-2-andrey.konovalov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210113130832.15549-1-andrey.konovalov@linaro.org> References: <20210113130832.15549-1-andrey.konovalov@linaro.org> Subject: [libcamera-devel] [PATCH 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 MIME-Version: 1.0 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 --- 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_;