{"id":12685,"url":"https://patchwork.libcamera.org/api/1.1/patches/12685/?format=json","web_url":"https://patchwork.libcamera.org/patch/12685/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210622134652.1279260-2-andrey.konovalov@linaro.org>","date":"2021-06-22T13:46:44","name":"[libcamera-devel,v5,1/9] qcam: viewfinder_gl: change uniform float tex_stepx to vec2 tex_step","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"6c3654377fc5dccf7b2189c61be5de913dbd2834","submitter":{"id":25,"url":"https://patchwork.libcamera.org/api/1.1/people/25/?format=json","name":"Andrey Konovalov","email":"andrey.konovalov@linaro.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12685/mbox/","series":[{"id":2168,"url":"https://patchwork.libcamera.org/api/1.1/series/2168/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2168","date":"2021-06-22T13:46:43","name":"qcam: viewfinder_gl: add RAW8, RAW10P and RAW12P formats","version":5,"mbox":"https://patchwork.libcamera.org/series/2168/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12685/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12685/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 9D25BC321B\n\tfor ;\n\tTue, 22 Jun 2021 13:47:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5D7DA68932;\n\tTue, 22 Jun 2021 15:47:07 +0200 (CEST)","from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com\n\t[IPv6:2a00:1450:4864:20::12f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5420460292\n\tfor ;\n\tTue, 22 Jun 2021 15:47:06 +0200 (CEST)","by mail-lf1-x12f.google.com with SMTP id i13so36011980lfc.7\n\tfor ;\n\tTue, 22 Jun 2021 06:47:06 -0700 (PDT)","from localhost.localdomain ([85.249.44.185])\n\tby smtp.googlemail.com with ESMTPSA id\n\tb19sm163125ljo.37.2021.06.22.06.47.04\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 22 Jun 2021 06:47:05 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"q57uosxk\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=1pJOzZy0cA+5PFPsdwnYX3JXmgdw7xElcszVRkfrj+Q=;\n\tb=q57uosxkI/AlctAjFGfdAaCiUOyAhwus5n4MIcX4wGGgYTh7zPnW8J1sd1u+htw9Dn\n\trEwxi83XKWG6cbxv+997H3ehhX8uFru6yqBQS5Wt9tlbRI8iIS9shSNaXOwUqohZpxID\n\tSPglNG0a1YvglhNVj5wvX0o4Q8mBe1Eu/jhG22BxNYZ7H5fx3NpR7IyaPPxWQ4Xis/ej\n\tgIoLOYNvesOooLS4pxnfW9qFqoIzqJA6YFEokg+R87MKAT+eQ81m+1pzdv4b9ZdYODWG\n\tCPpOOyGhxQSass7tO+xfD12ew4qbx2DHoVVjy7Ut0mWX6yUrbgBI+JodstSveAPz1UKP\n\t2w8g==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=1pJOzZy0cA+5PFPsdwnYX3JXmgdw7xElcszVRkfrj+Q=;\n\tb=hv4HV5vyr56B59RtCBAX9ylkq05apvqHmMe/pxLgUZLZx4eBYnNfa/0Je8F1cXxlgm\n\t2Oq8aYxeNaLP1P5dGBPOwauw4a/27zO57JkXL3QBA+HhQOrCqZ0pKhunH2ovlqVedS88\n\tOR7KRuvPbiRt6XWE/EYYWGm7SEXBl0UZpYbx8SHDqXAXII2iq7jhzKd2kk9LQbz8nvIB\n\to9n9w4zM3l+Z7lCzK4XCVt+6MmnZLog2kQZyaGBpteST0B7jyszs2P22nljxxArAlfSn\n\tRa75+roJu2yLgLg94mbSr7SaB69vLrMUQrrZrofaO0gLwUSrLe2uhb+a4pWC2g/os/YX\n\twJpw==","X-Gm-Message-State":"AOAM53094xO2faVJQFLf9v7n2uQ+yMHbufGOG1/gE0d4G5299ZMzyrbh\n\tr+/myOB0UuDwD/YKUrpLQelitiQk0ePC9A==","X-Google-Smtp-Source":"ABdhPJx0ZT/JkmN4xkFB18Y++4gMrgG/SW3L/HYBy23hGL+5MCSCVrOAAoVAhUk0a6e4Qo2CDWxUqA==","X-Received":"by 2002:ac2:5d69:: with SMTP id h9mr2834485lft.603.1624369625748;\n\tTue, 22 Jun 2021 06:47:05 -0700 (PDT)","From":"Andrey Konovalov ","To":"libcamera-devel@lists.libcamera.org,\n\tlaurent.pinchart@ideasonboard.com","Date":"Tue, 22 Jun 2021 16:46:44 +0300","Message-Id":"<20210622134652.1279260-2-andrey.konovalov@linaro.org>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20210622134652.1279260-1-andrey.konovalov@linaro.org>","References":"<20210622134652.1279260-1-andrey.konovalov@linaro.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 1/9] qcam: viewfinder_gl: change\n\tuniform 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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"morgan@casual-effects.com","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"In preparation to extend the supported formats, extend the tex_stepx\nuniform to cover the steps between texels in both horizontal and\nvertical directions.\n\nSigned-off-by: Andrey Konovalov \n---\n src/qcam/assets/shader/YUV_packed.frag | 8 ++++----\n src/qcam/viewfinder_gl.cpp | 7 ++++---\n src/qcam/viewfinder_gl.h | 2 +-\n 3 files changed, 9 insertions(+), 8 deletions(-)","diff":"diff --git a/src/qcam/assets/shader/YUV_packed.frag b/src/qcam/assets/shader/YUV_packed.frag\nindex 224dfafe..d6efd4ce 100644\n--- a/src/qcam/assets/shader/YUV_packed.frag\n+++ b/src/qcam/assets/shader/YUV_packed.frag\n@@ -12,7 +12,7 @@ precision mediump float;\n varying vec2 textureOut;\n \n uniform sampler2D tex_y;\n-uniform float tex_stepx;\n+uniform vec2 tex_step;\n \n void main(void)\n {\n@@ -49,10 +49,10 @@ void main(void)\n \t * a = fract(x) * 2 - 1\t\t\tif fract(x) >= 0.5\n \t */\n \tvec2 pos = textureOut;\n-\tfloat f_x = fract(pos.x / tex_stepx);\n+\tfloat f_x = fract(pos.x / tex_step.x);\n \n-\tvec4 left = texture2D(tex_y, vec2(pos.x - f_x * tex_stepx, pos.y));\n-\tvec4 right = texture2D(tex_y, vec2(pos.x + (1.0 - f_x) * tex_stepx , pos.y));\n+\tvec4 left = texture2D(tex_y, vec2(pos.x - f_x * tex_step.x, pos.y));\n+\tvec4 right = texture2D(tex_y, vec2(pos.x + (1.0 - f_x) * tex_step.x , pos.y));\n \n #if defined(YUV_PATTERN_UYVY)\n \tfloat y_left = mix(left.g, left.a, f_x * 2.0);\ndiff --git a/src/qcam/viewfinder_gl.cpp b/src/qcam/viewfinder_gl.cpp\nindex 5d9b442e..ff719418 100644\n--- a/src/qcam/viewfinder_gl.cpp\n+++ b/src/qcam/viewfinder_gl.cpp\n@@ -289,7 +289,7 @@ bool ViewFinderGL::createFragmentShader()\n \ttextureUniformY_ = shaderProgram_.uniformLocation(\"tex_y\");\n \ttextureUniformU_ = shaderProgram_.uniformLocation(\"tex_u\");\n \ttextureUniformV_ = shaderProgram_.uniformLocation(\"tex_v\");\n-\ttextureUniformStepX_ = shaderProgram_.uniformLocation(\"tex_stepx\");\n+\ttextureUniformStep_ = shaderProgram_.uniformLocation(\"tex_step\");\n \n \t/* Create the textures. */\n \tfor (std::unique_ptr &texture : textures_) {\n@@ -508,8 +508,9 @@ void ViewFinderGL::doRender()\n \t\t * ([0, 1]). There are exactly width - 1 steps between the\n \t\t * leftmost and rightmost texels.\n \t\t */\n-\t\tshaderProgram_.setUniformValue(textureUniformStepX_,\n-\t\t\t\t\t 1.0f / (size_.width() / 2 - 1));\n+\t\tshaderProgram_.setUniformValue(textureUniformStep_,\n+\t\t\t\t\t 1.0f / (size_.width() / 2 - 1),\n+\t\t\t\t\t 1.0f /* not used */);\n \t\tbreak;\n \n \tcase libcamera::formats::ABGR8888:\ndiff --git a/src/qcam/viewfinder_gl.h b/src/qcam/viewfinder_gl.h\nindex 150fa4ae..1b1faa91 100644\n--- a/src/qcam/viewfinder_gl.h\n+++ b/src/qcam/viewfinder_gl.h\n@@ -85,7 +85,7 @@ private:\n \tGLuint textureUniformU_;\n \tGLuint textureUniformV_;\n \tGLuint textureUniformY_;\n-\tGLuint textureUniformStepX_;\n+\tGLuint textureUniformStep_;\n \tunsigned int horzSubSample_;\n \tunsigned int vertSubSample_;\n \n","prefixes":["libcamera-devel","v5","1/9"]}