{"id":11388,"url":"https://patchwork.libcamera.org/api/1.1/patches/11388/?format=json","web_url":"https://patchwork.libcamera.org/patch/11388/","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":"<20210225183626.28288-2-andrey.konovalov@linaro.org>","date":"2021-02-25T18:36:22","name":"[libcamera-devel,1/5] qcam: viewfinder_gl: change uniform float tex_stepx to vec2 tex_step","commit_ref":null,"pull_url":null,"state":"superseded","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/11388/mbox/","series":[{"id":1730,"url":"https://patchwork.libcamera.org/api/1.1/series/1730/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1730","date":"2021-02-25T18:36:21","name":"qcam: viewfinder_gl: add RAW8, RAW10P and RAW12P formats","version":1,"mbox":"https://patchwork.libcamera.org/series/1730/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11388/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11388/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 B8B89BD1F1\n\tfor ;\n\tThu, 25 Feb 2021 18:37:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8843168A5D;\n\tThu, 25 Feb 2021 19:37:00 +0100 (CET)","from mail-lf1-x130.google.com (mail-lf1-x130.google.com\n\t[IPv6:2a00:1450:4864:20::130])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 16AC168A59\n\tfor ;\n\tThu, 25 Feb 2021 19:36:59 +0100 (CET)","by mail-lf1-x130.google.com with SMTP id u4so10095226lfs.0\n\tfor ;\n\tThu, 25 Feb 2021 10:36:59 -0800 (PST)","from localhost.localdomain ([85.249.43.69])\n\tby smtp.googlemail.com with ESMTPSA id\n\tx1sm1136772ljh.62.2021.02.25.10.36.57\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 25 Feb 2021 10:36:58 -0800 (PST)"],"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=\"MQETSXHw\"; 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\tbh=olzp5+f2p8vLdXof0aF2IDvl6Y/vw19jdOA72WR6mWo=;\n\tb=MQETSXHwHgzMdIBAksHaiRXvf+ePh+8OtSux7W+IePaX1ODcMIkJpD8qWfMCUGQSLn\n\tk92jwqDck+G0ewKL+A09W/Fa7WKOq9UhQu8nQnwLBcTEUk9friDlE4PqaUZaBFHhRCvs\n\twjuiqGFE8dFyYMC2B4cGFbbfB6YF2k/MbcHHqEFi0LpqBJITzkTRjb4spMTTTyR1goT9\n\teSokwU+jInttsHK+H18ohpqOqc09oFIqpxs11ThuD9xVCbiu6DLnLcGV9OZuzp3yAj6k\n\tofs1NDepR/OSRBde2UYX7lgON2nIIK8hEUR+ZteiAm+QZThiruaBUOy+y4wV7oiHiT/O\n\trnhA==","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;\n\tbh=olzp5+f2p8vLdXof0aF2IDvl6Y/vw19jdOA72WR6mWo=;\n\tb=KFknzOhpi/HhKdzvuKotXrfuiMagOWzNoBEO/FlExuYiXB4Dnt3bzxu0WDxH+8N5kh\n\tcN0El0MvZoQQOmu8sF4lclq6NITKOZApzW+cRou12iCibF5tL64NtqbpMGYMCYGmOFZr\n\twYeWprzX4YpZhW1j+fQgWmz67TeCl1yNo29Vi9xxVy+9olNdechIjadOXeGBAWV7TAQx\n\tsOyQhesj6u+JUM1t+LBYPCJZM0dqL//R4YWQVUURngpiqspQjkLf4dv6JvcarAArf5g8\n\tYw1qL3oVxPiXemIjgBd4RUhUH06VHqahC1xOYNqKJVj2MwCBZZ8EnRdVp8LLYhkeI0jQ\n\tAeEQ==","X-Gm-Message-State":"AOAM532jYoIZ6WhYIF59bh/FVW3OIytrDSiw8GoTuXoY23vTK9DYn2Pa\n\tDY0Lqlr2I+B295TBnuxV3zG4Ha8c8cSEbg==","X-Google-Smtp-Source":"ABdhPJwY/OHs+uajDSmRYX5jny9OQ7rltrRc7q6pII2I9Tlqs/hlUA/m5cwT8J3wN13BWuFkRpQmJQ==","X-Received":"by 2002:a05:6512:34c8:: with SMTP id\n\tw8mr2714772lfr.537.1614278218615; \n\tThu, 25 Feb 2021 10:36:58 -0800 (PST)","From":"Andrey Konovalov ","To":"libcamera-devel@lists.libcamera.org,\n\tlaurent.pinchart@ideasonboard.com","Date":"Thu, 25 Feb 2021 21:36:22 +0300","Message-Id":"<20210225183626.28288-2-andrey.konovalov@linaro.org>","X-Mailer":"git-send-email 2.17.1","In-Reply-To":"<20210225183626.28288-1-andrey.konovalov@linaro.org>","References":"<20210225183626.28288-1-andrey.konovalov@linaro.org>","Subject":"[libcamera-devel] [PATCH 1/5] qcam: viewfinder_gl: change uniform\n\tfloat 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","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","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","1/5"]}