Patch Detail
Show a patch.
GET /api/1.1/patches/23540/?format=api
{ "id": 23540, "url": "https://patchwork.libcamera.org/api/1.1/patches/23540/?format=api", "web_url": "https://patchwork.libcamera.org/patch/23540/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20250611013245.133785-35-bryan.odonoghue@linaro.org>", "date": "2025-06-11T01:32:44", "name": "[34/35] libcamera: shaders: Rename bayer_8 to bayer_unpacked", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "efd49ec39078e1219cea752ce0592bcf3ddb167b", "submitter": { "id": 175, "url": "https://patchwork.libcamera.org/api/1.1/people/175/?format=api", "name": "Bryan O'Donoghue", "email": "bryan.odonoghue@linaro.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/23540/mbox/", "series": [ { "id": 5212, "url": "https://patchwork.libcamera.org/api/1.1/series/5212/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5212", "date": "2025-06-11T01:32:10", "name": "Add GLES 2.0 GPUISP to libcamera", "version": 1, "mbox": "https://patchwork.libcamera.org/series/5212/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/23540/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/23540/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 6255EC332A\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 11 Jun 2025 01:34:43 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F34AE68E01;\n\tWed, 11 Jun 2025 03:34:42 +0200 (CEST)", "from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com\n\t[IPv6:2a00:1450:4864:20::32c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8DE4B68DFF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 11 Jun 2025 03:34:39 +0200 (CEST)", "by mail-wm1-x32c.google.com with SMTP id\n\t5b1f17b1804b1-4530921461aso26487835e9.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 10 Jun 2025 18:34:39 -0700 (PDT)", "from inspiron14p-linux.ht.home (188-141-3-146.dynamic.upc.ie.\n\t[188.141.3.146]) by smtp.gmail.com with ESMTPSA id\n\t5b1f17b1804b1-4532514138asm5680625e9.3.2025.06.10.18.34.36\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 10 Jun 2025 18:34:38 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"EqqfoiM2\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1749605679; x=1750210479;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=zJCYQUQNddeKnCWxfHEDrxIHP9gpUnE73ekiVXEWSuY=;\n\tb=EqqfoiM2zINbqpG1wqxnQkSwrQWl8bpHJNO+3vgzCETke8XbIZ7iO8uv/upFl+aoyx\n\tGIi9TRIcyJ+GocgJ1FwogUxG9TDy7FvHXhynmbOuzZ/27RYNah1pp1kfiTjw52Nr9HON\n\tQtVVkhzmYihH7VEnxt+AbVnv3T8phWSVpGcGoItIdguIRSdTyxkiq6PJiVKWS544LgSy\n\tW/wOCPjwI8xlaLn/R5MWtWFbQDuzCcUwPkCVQXUO8qTYdfKJrhW6uxIv0tn/23gsfq7V\n\tKr5wl84Cfzu0/OYOYCkQScz702ZBm4d/u36D4R2poMa+T/udcONy7bbC6nFB53nJMz8y\n\tAWbA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1749605679; x=1750210479;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=zJCYQUQNddeKnCWxfHEDrxIHP9gpUnE73ekiVXEWSuY=;\n\tb=Xzk6qQwY1lyapDd2iOHsos8NCd/Fmx7kR6fSnC4EMslx8XW02jQ5xwqC4E0NtjFV40\n\t2oknYdV2ElPA+KPz+CULbOvpXYIiMPUVFjjzDvSRniSJU3crPTgNWTa4mb7nJEeahknE\n\tPJI0x36UL4acjaEpPXviqFDTlQpV6YiF/PC9ojGeDfnVmwG9wVNn1Bc/NGmiSzo6ZOdI\n\tCuPZIF4SBvY0XMuEK/MygCWDKvOXZkczFbtPv+DgRmmmo8GpJWMqWi1F8oiQT87YEpOJ\n\tGH7P8xQBGQaWVNrb7Rd7/nfocF41mRohJP63UMQxPD1sROsVNAGiRs7NAk8jxxnD6DFl\n\tCZIA==", "X-Gm-Message-State": "AOJu0Yzbf1iYlf9te1ihT0ANK7nAvs08JFSoh4WFk0LvIn/MRDou5eY3\n\tngu2FE+IPoJ+EZyx5gbZ05uMVXbKTFEXFos3nPaNoxiP6hE7Dh1/5qNHMICsw5IMt82ishQMI4t\n\tVrYMOqcM=", "X-Gm-Gg": "ASbGncuLhATE+WwCI0DGNuGAzzTdDsK0JJtYhJZHjKvCpUJzaG3t+IFZVgHhVW+goy7\n\tdIS792wQdGzewjz5iKOv7YwTTFgqTR5gjpo46ZaUwQMxMBzzg/QZz4yJr5HsDR7PW1jdOLJ3abX\n\tdjc184Yixv68MwfNmU8r63jjAZkfqgFdYHOKZ4UWmSr3+kaYuY7fyOaeLBW8NmxNXG31nmVXv72\n\ttl/RiDKZkEOe5g9OUhQ2qPO/K9P809wAuYXL583pRWCq7oZ4uM44yuSkzeBLAOs8Pz5dt0YDhsf\n\tanVqZA2HJ4HOv4io/rlgADVGycOkColvzPLpw44eMOS2Lq3TLffbUJ0m9RG0W85/HBZyQ59Zi40\n\tSvM1TFrrRDgVPLdNqJC2pW68ngfr/bA4FikOL6hmvHA==", "X-Google-Smtp-Source": "AGHT+IFeFZH+bOIAHxkzAGZj3/R5Su7LWc1dRTHOeF4q6cSRfXWXYY3/eHmaM6QFkoQ/hR+U9amG7w==", "X-Received": "by 2002:a05:600c:154c:b0:43c:ec4c:25b4 with SMTP id\n\t5b1f17b1804b1-453248b0ee1mr10811865e9.10.1749605678863; \n\tTue, 10 Jun 2025 18:34:38 -0700 (PDT)", "From": "Bryan O'Donoghue <bryan.odonoghue@linaro.org>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>,\n\tBryan O'Donoghue <bryan.odonoghue@linaro.org>", "Subject": "[PATCH 34/35] libcamera: shaders: Rename bayer_8 to bayer_unpacked", "Date": "Wed, 11 Jun 2025 02:32:44 +0100", "Message-ID": "<20250611013245.133785-35-bryan.odonoghue@linaro.org>", "X-Mailer": "git-send-email 2.49.0", "In-Reply-To": "<20250611013245.133785-1-bryan.odonoghue@linaro.org>", "References": "<20250611013245.133785-1-bryan.odonoghue@linaro.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "From: Milan Zamazal <mzamazal@redhat.com>\n\nbayer_8.* shaders are now used for all unpacked sensor data formats,\nregardless of the pixel bit width. Let's rename the \"8-bit\" shaders to\navoid confusion.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\nSigned-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>\n---\n .../{bayer_8.frag => bayer_unpacked.frag} | 0\n .../{bayer_8.vert => bayer_unpacked.vert} | 0\n .../libcamera/internal/shaders/meson.build | 4 ++--\n src/apps/qcam/assets/shader/shaders.qrc | 4 ++--\n src/apps/qcam/viewfinder_gl.cpp | 16 ++++++-------\n src/libcamera/software_isp/debayer_egl.cpp | 24 +++++++++----------\n 6 files changed, 24 insertions(+), 24 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%)", "diff": "diff --git a/include/libcamera/internal/shaders/bayer_8.frag b/include/libcamera/internal/shaders/bayer_unpacked.frag\nsimilarity index 100%\nrename from include/libcamera/internal/shaders/bayer_8.frag\nrename to include/libcamera/internal/shaders/bayer_unpacked.frag\ndiff --git a/include/libcamera/internal/shaders/bayer_8.vert b/include/libcamera/internal/shaders/bayer_unpacked.vert\nsimilarity index 100%\nrename from include/libcamera/internal/shaders/bayer_8.vert\nrename to include/libcamera/internal/shaders/bayer_unpacked.vert\ndiff --git a/include/libcamera/internal/shaders/meson.build b/include/libcamera/internal/shaders/meson.build\nindex 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 ])\ndiff --git a/src/apps/qcam/assets/shader/shaders.qrc b/src/apps/qcam/assets/shader/shaders.qrc\nindex 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 \t<file>../../../../../include/libcamera/internal/shaders/YUV_3_planes.frag</file>\n \t<file>../../../../../include/libcamera/internal/shaders/YUV_packed.frag</file>\n \t<file>../../../../../include/libcamera/internal/shaders/bayer_1x_packed.frag</file>\n-\t<file>../../../../../include/libcamera/internal/shaders/bayer_8.frag</file>\n-\t<file>../../../../../include/libcamera/internal/shaders/bayer_8.vert</file>\n+\t<file>../../../../../include/libcamera/internal/shaders/bayer_unpacked.frag</file>\n+\t<file>../../../../../include/libcamera/internal/shaders/bayer_unpacked.vert</file>\n \t<file>../../../../../include/libcamera/internal/shaders/identity.vert</file>\n </qresource>\n </RCC>\ndiff --git a/src/apps/qcam/viewfinder_gl.cpp b/src/apps/qcam/viewfinder_gl.cpp\nindex 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 \tcase libcamera::formats::SBGGR8:\n \t\tfirstRed_.setX(1.0);\n \t\tfirstRed_.setY(1.0);\n-\t\tvertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.vert\";\n-\t\tfragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.frag\";\n+\t\tvertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.vert\";\n+\t\tfragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.frag\";\n \t\ttextureMinMagFilters_ = GL_NEAREST;\n \t\tbreak;\n \tcase libcamera::formats::SGBRG8:\n \t\tfirstRed_.setX(0.0);\n \t\tfirstRed_.setY(1.0);\n-\t\tvertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.vert\";\n-\t\tfragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.frag\";\n+\t\tvertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.vert\";\n+\t\tfragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.frag\";\n \t\ttextureMinMagFilters_ = GL_NEAREST;\n \t\tbreak;\n \tcase libcamera::formats::SGRBG8:\n \t\tfirstRed_.setX(1.0);\n \t\tfirstRed_.setY(0.0);\n-\t\tvertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.vert\";\n-\t\tfragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.frag\";\n+\t\tvertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.vert\";\n+\t\tfragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.frag\";\n \t\ttextureMinMagFilters_ = GL_NEAREST;\n \t\tbreak;\n \tcase libcamera::formats::SRGGB8:\n \t\tfirstRed_.setX(0.0);\n \t\tfirstRed_.setY(0.0);\n-\t\tvertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.vert\";\n-\t\tfragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.frag\";\n+\t\tvertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.vert\";\n+\t\tfragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.frag\";\n \t\ttextureMinMagFilters_ = GL_NEAREST;\n \t\tbreak;\n \tcase libcamera::formats::SBGGR10_CSI2P:\ndiff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp\nindex 71742d84..9ec96660 100644\n--- a/src/libcamera/software_isp/debayer_egl.cpp\n+++ b/src/libcamera/software_isp/debayer_egl.cpp\n@@ -189,10 +189,10 @@ int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputForm\n \tcase libcamera::formats::SGBRG8:\n \tcase libcamera::formats::SGRBG8:\n \tcase libcamera::formats::SRGGB8:\n-\t\tfragmentShaderData = bayer_8_frag;\n-\t\tfragmentShaderDataLen = bayer_8_frag_len;\n-\t\tvertexShaderData = bayer_8_vert;\n-\t\tvertexShaderDataLen = bayer_8_vert_len;\n+\t\tfragmentShaderData = bayer_unpacked_frag;\n+\t\tfragmentShaderDataLen = bayer_unpacked_frag_len;\n+\t\tvertexShaderData = bayer_unpacked_vert;\n+\t\tvertexShaderDataLen = bayer_unpacked_vert_len;\n \t\tbreak;\n \tcase libcamera::formats::SBGGR10_CSI2P:\n \tcase libcamera::formats::SGBRG10_CSI2P:\n@@ -200,10 +200,10 @@ int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputForm\n \tcase libcamera::formats::SRGGB10_CSI2P:\n \t\tegl_.pushEnv(shaderEnv, \"#define RAW10P\");\n \t\tif (BayerFormat::fromPixelFormat(inputFormat).packing == BayerFormat::Packing::None) {\n-\t\t\tfragmentShaderData = bayer_8_frag;\n-\t\t\tfragmentShaderDataLen = bayer_8_frag_len;\n-\t\t\tvertexShaderData = bayer_8_vert;\n-\t\t\tvertexShaderDataLen = bayer_8_vert_len;\n+\t\t\tfragmentShaderData = bayer_unpacked_frag;\n+\t\t\tfragmentShaderDataLen = bayer_unpacked_frag_len;\n+\t\t\tvertexShaderData = bayer_unpacked_vert;\n+\t\t\tvertexShaderDataLen = bayer_unpacked_vert_len;\n \t\t\tglFormat_ = GL_RG;\n \t\t\tbytesPerPixel_ = 2;\n \t\t} else {\n@@ -219,10 +219,10 @@ int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputForm\n \tcase libcamera::formats::SRGGB12_CSI2P:\n \t\tegl_.pushEnv(shaderEnv, \"#define RAW12P\");\n \t\tif (BayerFormat::fromPixelFormat(inputFormat).packing == BayerFormat::Packing::None) {\n-\t\t\tfragmentShaderData = bayer_8_frag;\n-\t\t\tfragmentShaderDataLen = bayer_8_frag_len;\n-\t\t\tvertexShaderData = bayer_8_vert;\n-\t\t\tvertexShaderDataLen = bayer_8_vert_len;\n+\t\t\tfragmentShaderData = bayer_unpacked_frag;\n+\t\t\tfragmentShaderDataLen = bayer_unpacked_frag_len;\n+\t\t\tvertexShaderData = bayer_unpacked_vert;\n+\t\t\tvertexShaderDataLen = bayer_unpacked_vert_len;\n \t\t\tglFormat_ = GL_RG;\n \t\t\tbytesPerPixel_ = 2;\n \t\t} else {\n", "prefixes": [ "34/35" ] }