Message ID | 20250611013245.133785-32-bryan.odonoghue@linaro.org |
---|---|
State | New |
Headers | show
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 [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id DEE8CC3334 for <parsemail@patchwork.libcamera.org>; Wed, 11 Jun 2025 01:34:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 56E7C68DCA; Wed, 11 Jun 2025 03:34:31 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="OpQN7zJ6"; dkim-atps=neutral Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 690A368DFA for <libcamera-devel@lists.libcamera.org>; Wed, 11 Jun 2025 03:34:28 +0200 (CEST) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43edecbfb46so51413495e9.0 for <libcamera-devel@lists.libcamera.org>; Tue, 10 Jun 2025 18:34:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749605668; x=1750210468; 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=3H9DGvojUoUk5Y3iEb9uuLwH3EKoTXsq6B1yGjTZ7oo=; b=OpQN7zJ6oIxWpsFXX8QtyOyNy/CUsN9lHBuFyoxt6t9mDsE1ApaOBWF/+prLbuaUiB wYkd/PjJdnxE+b2QIB4Axcx5dEw7QVxpOj8u5ElV6lrELXsHqZeWPcOawsyF6BLB8khU BKY4lg+KcuC4qTtsdXZNxs0hycig3NUkKLPJwsRHYRphWGmPpMz6MRjZwiNa3v3nc9R2 VFQcPfQdNlqqtD1J6REuyCuyqPhgQNkI5tPI4Oi/3prYSYgi8ibLLulU/yu+31PwjC5r l4ILxPjF9uEGRRKEQH7OnDR1+wnwC/yfKv7ACdwxIHxtjM4IKvqDaF3DfkQOIo36C/05 lA4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749605668; x=1750210468; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3H9DGvojUoUk5Y3iEb9uuLwH3EKoTXsq6B1yGjTZ7oo=; b=DO0mnUgJGt50jIVicvm/a8FnZCyPNywotmKZOx3S2P3Cw2hAnCtQ99+LF+6Ww7Tb3/ 1PZ2fXFPcBIKx0VZKaSbX+TjLB2q4HkoVzA6KjxeiTU9UuxM0e2QW7n1HigNaYnqoaxO iSEuo9oJCgMABGwVw2TnrEOTU1GTX/W6F8FpWbdbON6HhY74+Yzz7vnw0Fm0e1oXZcJZ S1ZPjkUObjaa2i4wVDdJ943fDMt21zkm8suotJNE6qRGBToH57Wr9viV2k7Wcp+WMNpO dKuu1cdg3JCcyVDDsLr6PuHSe0UTF6Jo5oNJdtnTzHY/xeRtgQRowRXVloupmkzFc53N 4cgg== X-Gm-Message-State: AOJu0Yw8HfjmyGyvL1K0xUH4O4WNoqUe+tXIGMbeC/kJd+vK2fecg13q nDoSq3aWx9GocXolQlOCIt5WFYxdpadtYobEgHx16B59kuz6zrcvFnTXoOCMKKWkQqn+2pGuObE A3NmqMM4= X-Gm-Gg: ASbGncsMvddBYzEFHw9KWN9cGPHZreLAQuV8TDJTJ2f4v1R2u7/CrcVNTCUnaP34ERv WFtT0XE4FhOoNveXG/SLdJJzNzLjx1ouedWBfQv1fOy9Uwh4PguhOB2e6Z6R5Bk9+vkAviYccrC q3cRq/KCmWWe2kN3q9ppKy9we0hL1ldWnRj+VJkVIdMeeDvKQ0BBkLahR8FrHuFyspZqJ5VsMdV CrwvBWmveLFWNmj+DlD6wwp+2QoqDL4DBp1dhbtqEcP86u/rZ5PA7dBC13utwsEr7+bpzvEBvab VnwOkVrrjWoKE1ISqMJkV+UqegIim84jgL+2gGnKInO++L4Ql0tSCOtPQiWAByBRCpdgD47qzsr tH4QwsjP6P+CNVMoMpHBQPpKlwb6s/ICmYTj4HJMkpQ== X-Google-Smtp-Source: AGHT+IELh4LjuV6Y6UU0QJ5FVZOa8NqfSBPQSUHfJRNQNJY/uDLfeYZlOMMqs53qRcX1Dl5gXmbylg== X-Received: by 2002:a05:600c:4f41:b0:453:6ca:16a6 with SMTP id 5b1f17b1804b1-45324edf307mr7946645e9.10.1749605667801; Tue, 10 Jun 2025 18:34:27 -0700 (PDT) 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-4532514138asm5680625e9.3.2025.06.10.18.34.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 18:34:27 -0700 (PDT) From: Bryan O'Donoghue <bryan.odonoghue@linaro.org> To: libcamera-devel@lists.libcamera.org Cc: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Subject: [PATCH 31/35] libcamera: shaders: Extend bayer shaders to support swapping R and B on output Date: Wed, 11 Jun 2025 02:32:41 +0100 Message-ID: <20250611013245.133785-32-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>, <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>, <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> |
Series |
|
Related |
show
|
diff --git a/include/libcamera/internal/shaders/bayer_1x_packed.frag b/include/libcamera/internal/shaders/bayer_1x_packed.frag index 90bd6457..c0632eb1 100644 --- a/include/libcamera/internal/shaders/bayer_1x_packed.frag +++ b/include/libcamera/internal/shaders/bayer_1x_packed.frag @@ -268,5 +268,9 @@ void main(void) rgb.b = texture2D(blue_param, vec2(rgb.b, 0.5)).b; #endif +#if defined (SWAP_BLUE) + gl_FragColor = vec4(rgb.bgr, 1.0); +#else gl_FragColor = vec4(rgb, 1.0); +#endif } diff --git a/include/libcamera/internal/shaders/bayer_8.frag b/include/libcamera/internal/shaders/bayer_8.frag index 5955c2ea..74ce1509 100644 --- a/include/libcamera/internal/shaders/bayer_8.frag +++ b/include/libcamera/internal/shaders/bayer_8.frag @@ -163,5 +163,9 @@ void main(void) { rgb.b = texture2D(red_param, vec2(rgb.b, 0.5)).b; #endif - gl_FragColor.rgb = rgb; +#if defined (SWAP_BLUE) + gl_FragColor = vec4(rgb.bgr, 1.0); +#else + gl_FragColor = vec4(rgb, 1.0); +#endif }
We can easily facilitate swapping R and B on output. Pivot on an environment define for this purpose. Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- include/libcamera/internal/shaders/bayer_1x_packed.frag | 4 ++++ include/libcamera/internal/shaders/bayer_8.frag | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)