[{"id":36282,"web_url":"https://patchwork.libcamera.org/comment/36282/","msgid":"<176056997350.635357.14652887557036268959@ping.linuxembedded.co.uk>","date":"2025-10-15T23:12:53","subject":"Re: [PATCH v3 27/39] libcamera: shaders: Rename bayer_8 to\n\tbayer_unpacked","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Bryan O'Donoghue (2025-10-15 02:22:39)\n> From: Milan Zamazal \n> \n> bayer_8.* shaders are now used for all unpacked sensor data formats,\n> regardless of the pixel bit width. Let's rename the \"8-bit\" shaders to\n> avoid confusion.\n> \n> Signed-off-by: Milan Zamazal \n> Signed-off-by: Bryan O'Donoghue \n> ---\n> .../{bayer_8.frag => bayer_unpacked.frag} | 0\n> .../{bayer_8.vert => bayer_unpacked.vert} | 0\n> include/libcamera/internal/shaders/meson.build | 4 ++--\n> src/apps/qcam/assets/shader/shaders.qrc | 4 ++--\n> src/apps/qcam/viewfinder_gl.cpp | 16 ++++++++--------\n> 5 files changed, 12 insertions(+), 12 deletions(-)\n> rename include/libcamera/internal/shaders/{bayer_8.frag => bayer_unpacked.frag} (100%)\n> rename include/libcamera/internal/shaders/{bayer_8.vert => bayer_unpacked.vert} (100%)\n> \n> diff --git a/include/libcamera/internal/shaders/bayer_8.frag b/include/libcamera/internal/shaders/bayer_unpacked.frag\n> similarity index 100%\n> rename from include/libcamera/internal/shaders/bayer_8.frag\n> rename to include/libcamera/internal/shaders/bayer_unpacked.frag\n> diff --git a/include/libcamera/internal/shaders/bayer_8.vert b/include/libcamera/internal/shaders/bayer_unpacked.vert\n> similarity index 100%\n> rename from include/libcamera/internal/shaders/bayer_8.vert\n> rename to include/libcamera/internal/shaders/bayer_unpacked.vert\n> diff --git a/include/libcamera/internal/shaders/meson.build b/include/libcamera/internal/shaders/meson.build\n> index 386b342d..dd441a57 100644\n> --- a/include/libcamera/internal/shaders/meson.build\n> +++ b/include/libcamera/internal/shaders/meson.build\n> @@ -4,7 +4,7 @@\n> # for the purposes of inclusion in OpenGL debayering\n> shader_files = files([\n> 'bayer_1x_packed.frag',\n> - 'bayer_8.frag',\n> - 'bayer_8.vert',\n> + 'bayer_unpacked.frag',\n> + 'bayer_unpacked.vert',\n> 'identity.vert',\n> ])\n> diff --git a/src/apps/qcam/assets/shader/shaders.qrc b/src/apps/qcam/assets/shader/shaders.qrc\n> index 04f9d706..32dfa51b 100644\n> --- a/src/apps/qcam/assets/shader/shaders.qrc\n> +++ b/src/apps/qcam/assets/shader/shaders.qrc\n> @@ -6,8 +6,8 @@\n> ../../../../../include/libcamera/internal/shaders/YUV_3_planes.frag\n> ../../../../../include/libcamera/internal/shaders/YUV_packed.frag\n> ../../../../../include/libcamera/internal/shaders/bayer_1x_packed.frag\n> - ../../../../../include/libcamera/internal/shaders/bayer_8.frag\n> - ../../../../../include/libcamera/internal/shaders/bayer_8.vert\n> + ../../../../../include/libcamera/internal/shaders/bayer_unpacked.frag\n> + ../../../../../include/libcamera/internal/shaders/bayer_unpacked.vert\n> ../../../../../include/libcamera/internal/shaders/identity.vert\n\nNo issues on that qt6.preprocess or such here this time ?\n\nAnyway - Assuming not:\n\nReviewed-by: Kieran Bingham \n\n> \n> \n> diff --git a/src/apps/qcam/viewfinder_gl.cpp b/src/apps/qcam/viewfinder_gl.cpp\n> index 70f60065..95965ab7 100644\n> --- a/src/apps/qcam/viewfinder_gl.cpp\n> +++ b/src/apps/qcam/viewfinder_gl.cpp\n> @@ -235,29 +235,29 @@ bool ViewFinderGL::selectFormat(const libcamera::PixelFormat &format)\n> case libcamera::formats::SBGGR8:\n> firstRed_.setX(1.0);\n> firstRed_.setY(1.0);\n> - vertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.vert\";\n> - fragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.frag\";\n> + vertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.vert\";\n> + fragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.frag\";\n> textureMinMagFilters_ = GL_NEAREST;\n> break;\n> case libcamera::formats::SGBRG8:\n> firstRed_.setX(0.0);\n> firstRed_.setY(1.0);\n> - vertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.vert\";\n> - fragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.frag\";\n> + vertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.vert\";\n> + fragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.frag\";\n> textureMinMagFilters_ = GL_NEAREST;\n> break;\n> case libcamera::formats::SGRBG8:\n> firstRed_.setX(1.0);\n> firstRed_.setY(0.0);\n> - vertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.vert\";\n> - fragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.frag\";\n> + vertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.vert\";\n> + fragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.frag\";\n> textureMinMagFilters_ = GL_NEAREST;\n> break;\n> case libcamera::formats::SRGGB8:\n> firstRed_.setX(0.0);\n> firstRed_.setY(0.0);\n> - vertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.vert\";\n> - fragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.frag\";\n> + vertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.vert\";\n> + fragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.frag\";\n> textureMinMagFilters_ = GL_NEAREST;\n> break;\n> case libcamera::formats::SBGGR10_CSI2P:\n> -- \n> 2.51.0\n>","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 56EA1C3259\n\tfor ;\n\tWed, 15 Oct 2025 23:12:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EF9906064A;\n\tThu, 16 Oct 2025 01:12:57 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 70B3C605F3\n\tfor ;\n\tThu, 16 Oct 2025 01:12:56 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0061AC72;\n\tThu, 16 Oct 2025 01:11:16 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"fyWVp4mj\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1760569877;\n\tbh=yM4UjgKujxrCVPkzfOyK4X7rOiLAGBKphLxWnPuf9Ro=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=fyWVp4mj1zwpp5tGKqB8P7X7CT2v/NOfnUkFD4CsL5mVufzZKHo24tXK5osTtjaeE\n\t36h2J1mAxkeEae06DOuIu2dlhted2nRjMyFGQwfOxcsB6l504KELWeK1OIGYgewDJc\n\t2r7bMmURQZPIDHFOlQzsgeKR5JOOBKARHxnYS4lw=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20251015012251.17508-28-bryan.odonoghue@linaro.org>","References":"<20251015012251.17508-1-bryan.odonoghue@linaro.org>\n\t<20251015012251.17508-28-bryan.odonoghue@linaro.org>","Subject":"Re: [PATCH v3 27/39] libcamera: shaders: Rename bayer_8 to\n\tbayer_unpacked","From":"Kieran Bingham ","Cc":"hdegoede@redhat.com, mzamazal@redhat.com, bryan.odonoghue@linaro.org,\n\tbod.linux@nxsw.ie","To":"Bryan O'Donoghue ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Thu, 16 Oct 2025 00:12:53 +0100","Message-ID":"<176056997350.635357.14652887557036268959@ping.linuxembedded.co.uk>","User-Agent":"alot/0.9.1","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]