From patchwork Tue Dec 2 13:45:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 25316 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id BAD79C32E7 for ; Tue, 2 Dec 2025 13:46:08 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6362060D12; Tue, 2 Dec 2025 14:46:07 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Yf4UHbLA"; dkim-atps=neutral Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6DDD760C88 for ; Tue, 2 Dec 2025 14:46:03 +0100 (CET) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4779cb0a33fso57907485e9.0 for ; Tue, 02 Dec 2025 05:46:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764683163; x=1765287963; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nAlpCB4iJopL0Pn768w20N/UlmcrQmnghUNHBy8yJOY=; b=Yf4UHbLAzRl0+cXHae4TGW+DoXiRVno/Gci1f0JCMkfGm4VWF+d9FYQ4UnylRgE3eK NMAZYTTOmF8ao/WHnU+UUOtxZzzkDvZxA4fi2uxbjqJ3cgXC/5FGo0x4YPx05N31BLqu U3/QcC3bEbjxQTG5jZ9JTEiK+CnlPIqDJM5rXGPCdk9uemarXwecDFhvS1g4Zc0q2JhB PHjcLyCNVn8+XKaGOI9c5tnzj3N+m9mBOjuv+Z/UttPt9Y1oy7N7JaEJvpxlq7f7SQD1 Zts9f5Z7Wj2cu0OXXZQGmC6p3nwfVAXxVedLpKARYlJnB/NKlZc4uunkQf2mmt9bnnDL wiLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764683163; x=1765287963; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=nAlpCB4iJopL0Pn768w20N/UlmcrQmnghUNHBy8yJOY=; b=l0ApkMqWyMDp+MZOuLlAfJtO0/DbhtlcNmzsrz2/Kv8zkVZn65Mlw63UCZPzvmEsLZ D/Bl7EZr31zo2H9DyiZxQD1PVENFzpNefzTCwAkfJT82GpnoE2zeZuJwfkGDjYDpVR/+ zewT4zhgsTcIVjptMCET6OM+eqbFL5YSkPrKKL5RToV2zpiQ06LP04CuOGezffwz/cdA 87i7YASeuQ/7gznGTFl4/5MMj7BKrFWKGaKxlXx779yTXcaWkdDfrHl3Bj2CaEXPz/eF hozAKGar556WrPzS5RVbtfLCXEqbawuPIjkw5jilonkU7DVXfwcP8ypwm3zOUSwCREFH oPkA== X-Gm-Message-State: AOJu0YwOWSIOuIrrZ2qHbsMHWkv2qkwaReGCBsfb2XEWpOJoPDVeKw4l fnxaiRaKPZ3uHQuBSDgPiaZ/kAbvU8J+9NysieOHtNcYmD3OfJLniRlgnOoWRWuKdmpmPpPmPjr eU4js X-Gm-Gg: ASbGncs00pMBJCJAUphEkT0c8IfmF81QBa1RYNHUDG3AuXZ9v2TC/ort1y7Oa1jpyLF rWphDOsAcbE3o5rbAdWKE9LLDDRiiPNWF3FyX2muVYymHM6TbTOc9CbHFIcah/6aeQ9Z4kQMeNr tqBcsdDe3Z4aM3xp7/rmIXHwg9Nbgxj4a/spf27HIBdKlA4DXxKoLI2F74HNb/kzatj0qy1p259 HaBtzZKLuTx2fVUsjBEUF3ea1pnJtxVbhbYGeVQmO9kzpiLujc+9HMnCvj/VphiiQUb7e/z5Rmo cRDsy0K3YTR/r8IR1ZLT0u9Yv0OjMjKX6f0MBku3zH8wbHMS2zOTVgkJ9XzJX3xYM94owfzu7vH uZ+lW/fXwrRlmAJbhIXzkbbWk4V+SmI3Lt3Es5UF2Eg2pS5XEaDfckJrGNM8AICX60biQUm2hqh C8EfSQyim/TsD8FNUHvMBivjKXQ7Ca+4kQeKz7MAND4qxFgdWq0Atm5pPkw/zIpzXACXA= X-Google-Smtp-Source: AGHT+IFa03vzASFOeV3tkYwOCHMw8tgEJ5PO5wg+99OqFUMyin7qdWS3VHfWaCM9WZslKvcaaksONw== X-Received: by 2002:a05:600c:470d:b0:471:1717:411 with SMTP id 5b1f17b1804b1-477c01edab1mr514226995e9.24.1764683162615; Tue, 02 Dec 2025 05:46:02 -0800 (PST) Received: from inspiron14p-linux.ht.home (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47926f0ec69sm19383375e9.1.2025.12.02.05.46.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Dec 2025 05:46:01 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue , Milan Zamazal , Kieran Bingham Subject: [PATCH v6 07/24] libcamera: shaders: Extend bayer shaders to support swapping R and B on output Date: Tue, 2 Dec 2025 13:45:27 +0000 Message-ID: <20251202134544.662446-8-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251202134544.662446-1-bryan.odonoghue@linaro.org> References: <20251202134544.662446-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" We can easily facilitate swapping R and B on output. Pivot on an environment define for this purpose. Reviewed-by: Milan Zamazal Acked-by: Kieran Bingham Signed-off-by: Bryan O'Donoghue --- src/libcamera/shaders/bayer_1x_packed.frag | 4 ++++ src/libcamera/shaders/bayer_unpacked.frag | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/libcamera/shaders/bayer_1x_packed.frag b/src/libcamera/shaders/bayer_1x_packed.frag index 171a928c2..db8c2a0b3 100644 --- a/src/libcamera/shaders/bayer_1x_packed.frag +++ b/src/libcamera/shaders/bayer_1x_packed.frag @@ -257,5 +257,9 @@ void main(void) rgb.g = (rin * ccm[1][0]) + (gin * ccm[1][1]) + (bin * ccm[1][2]); rgb.b = (rin * ccm[2][0]) + (gin * ccm[2][1]) + (bin * ccm[2][2]); +#if defined (SWAP_BLUE) + gl_FragColor = vec4(rgb.bgr, 1.0); +#else gl_FragColor = vec4(rgb, 1.0); +#endif } diff --git a/src/libcamera/shaders/bayer_unpacked.frag b/src/libcamera/shaders/bayer_unpacked.frag index c41d72f4f..06d80f3dd 100644 --- a/src/libcamera/shaders/bayer_unpacked.frag +++ b/src/libcamera/shaders/bayer_unpacked.frag @@ -152,5 +152,9 @@ void main(void) { rgb.g = (rin * ccm[1][0]) + (gin * ccm[1][1]) + (bin * ccm[1][2]); rgb.b = (rin * ccm[2][0]) + (gin * ccm[2][1]) + (bin * ccm[2][2]); - gl_FragColor.rgb = rgb; +#if defined (SWAP_BLUE) + gl_FragColor = vec4(rgb.bgr, 1.0); +#else + gl_FragColor = vec4(rgb, 1.0); +#endif }