{"id":12448,"url":"https://patchwork.libcamera.org/api/patches/12448/?format=json","web_url":"https://patchwork.libcamera.org/patch/12448/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20210527105511.447089-2-andrey.konovalov@linaro.org>","date":"2021-05-27T10:55:07","name":"[libcamera-devel,v2,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/people/25/?format=json","name":"Andrey Konovalov","email":"andrey.konovalov@linaro.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12448/mbox/","series":[{"id":2086,"url":"https://patchwork.libcamera.org/api/series/2086/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2086","date":"2021-05-27T10:55:06","name":"qcam: viewfinder_gl: add RAW8, RAW10P and RAW12P formats","version":2,"mbox":"https://patchwork.libcamera.org/series/2086/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12448/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12448/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 E8DF2C3203\n\tfor ;\n\tThu, 27 May 2021 10:55:30 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2F493602AD;\n\tThu, 27 May 2021 12:55:29 +0200 (CEST)","from mail-lf1-x134.google.com (mail-lf1-x134.google.com\n\t[IPv6:2a00:1450:4864:20::134])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4C5F1602AA\n\tfor ;\n\tThu, 27 May 2021 12:55:26 +0200 (CEST)","by mail-lf1-x134.google.com with SMTP id a2so7328950lfc.9\n\tfor ;\n\tThu, 27 May 2021 03:55:26 -0700 (PDT)","from localhost.localdomain ([85.249.41.56])\n\tby smtp.googlemail.com with ESMTPSA id\n\th23sm170148lfc.52.2021.05.27.03.55.24\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 27 May 2021 03:55:25 -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=\"G1KipA81\"; 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=G1KipA815odUSHkrusrLl7MC5/MvtmFW6OiIkYmHq5xOPp0f03i+2v8NfgLLbQEiRT\n\t79o/DYQBl/bCXrBUvDcSH4DcrlQFUXKNkVQ72YFjziFbY//ZznoVksTfVwGDE8CLTNIZ\n\ttQi5BlUwARPfXOqkjMfOx37xy5iQwTIl0l8lVBo/14qkpZ04ewVqkB9iODVKZ6+uXm3r\n\tYCD79f05foO6y5A3Enx9Ujtbv0ZBI5NS3CJSGQ4yxAK9t8qw/HhPFnCqMzQl+0MDx3Cz\n\t02+/ALg907acSVq9LCG98ZhzggOfCjNsomgjvhVyEyOR1J6U2yXWZfDynW5cLAsAq3sz\n\tdxSQ==","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=fLzsiaafRs38jy+9YQRXdc4pDbta9Blhmfdo622trZJk1koZ/eBXIStT8otWkVPeqM\n\t/4yC5ICGxMEncjY8rDofjFbz3cLPvjs32PAAPYYx+HgAAXfwAEN865aU1VlIJCAYOEoO\n\t3cpL+GHF0L8C32/rfm8WR9T5c4eHqf3y95S7s6PPNCNE5jg/h3YKkF+8HsLuQVu0S1An\n\tJfIodHwXK5OJqJF4dbVHDSL67V1DSssI6wYna1cveHQ3TM8EsGqhqYGg9LyZiDefy9DH\n\tbAl5LDetccWfC9TKkkZgMX4WEpR64XGR6oLZGxoOXjvE2BQ4Hyphid/1gfNsD4Ff9B8p\n\toiOA==","X-Gm-Message-State":"AOAM5308/x0qWRpRU/qGzYfEn1pL63IZouqsLD6iCNoXWJsrdYwzxxh6\n\tnChaavnWCrLCCPf8PAJo2NlrEUPOPHJgcg==","X-Google-Smtp-Source":"ABdhPJx/Bl56fm8igrtOJI5+jHzYQ3gbAOoQtG2UNEsnYctsOTiFNhrv47p0ThZdEJtgglXeLec7aw==","X-Received":"by 2002:ac2:5a45:: with SMTP id r5mr2095818lfn.342.1622112925584;\n\tThu, 27 May 2021 03:55:25 -0700 (PDT)","From":"Andrey Konovalov ","To":"libcamera-devel@lists.libcamera.org,\n\tlaurent.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","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 1/5] 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","v2","1/5"]}