From patchwork Thu Nov 27 02:37:31 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: 25253 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 6D53BC32E0 for ; Thu, 27 Nov 2025 02:38:23 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 94B4F60B2F; Thu, 27 Nov 2025 03:38:22 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Kbvt6NF3"; dkim-atps=neutral Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1C6B560A8B for ; Thu, 27 Nov 2025 03:38:19 +0100 (CET) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-477b198f4bcso1723635e9.3 for ; Wed, 26 Nov 2025 18:38:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764211098; x=1764815898; 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=VHmyzGkOwao2iOVfyxrEPPmvuSeYu4ezxiDGM411cRc=; b=Kbvt6NF353QnjRwae+oVWjtEfC4z6gUUdYBwmAPXNr5nQdtB3B1PYE1XtKkNQaNgIO ngy4hGcC2bY0cmP2AY1E25EdmTAXcOQjVnFWRMJeTGqCJinh45270uP5Q5gbtXe580MS icCaiDOqSVwQgl0xJ5FNqLBOB+yRN2ISpNA7xa+HbtRQ2Bv2YRkC2GNSab3OOZbTBnGN ws3kM3Nb7nNlCoHOLkI7MFxmjsCyOQpbkKRnQ3j6fiP+FzjK4DAlCJpUSkxS7kQh8dRU mR6ZWmZQuR9GISJRDNabKMMjkyEZiUEb01fVv7Kgpk1Q/Xmy/xKW/Pf2BAcsU9fC3BMN Z1HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764211098; x=1764815898; 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=VHmyzGkOwao2iOVfyxrEPPmvuSeYu4ezxiDGM411cRc=; b=ecYISd4G4y0XjPvQGppOjo73OsIewoWr6vMrrmLFxFkDhzznli+4+FIMt9Cez49+m9 4iAcwjmU/SNz29ufiTqZMz50TgCO1A1LWga9ggiB9OdAVkWWiM6RugACeRXLVEJ2yAmy IKbc5vfc50T9q6nRMQ1gbsRfTrdrh31ZectbmgF51DcgGw6CQdyXKQIg6eCBuXxFt4tb +y2vnWLmh826N1N4cMpqPBQffCgDXkVghm3AX2YC2kdDK+weoHhtWjq2nvoj53tRvXfr 6xs2N2LwCgkah6ksLwBQTcNwPrEqLL5J+IgmPL9p8zei/qUnWyBbsze0+sFdcJaZSr4q zpBQ== X-Gm-Message-State: AOJu0YyzRJ9mWTQ+3K+JHEzWBbuZ5t/ZwUXpxZCPNIDpxpHp1adr3HQk a/nxsON6JkvdfdncUxWdkzZLCrF79AmwDE/hkKHlarYWvjjo2oyAOze2W+zGGEL7C8Wx4fWtL3r A+5DULXc= X-Gm-Gg: ASbGnctv/3b7P8YLo8ku0VN5qeY+tNVMDeJte7UVEEygqU+PMPETXiP45CE8d8pMRLq 63viep3cBnXiTHZ62lKtv7mg/Tt8hgIulbP4SPoL9Cey9rwJXGtI3g4qqqN9PM4vNhrO8zTSAq+ DxNu55EFLufBnWutTn6YKO5bVvIP7SrsHBoM0i4y9NQnbxj0tdeKyLWAg0taqdn3lF2DuriHs7G /bGVvPfJtokMoIGxmQI3oeudwNelCPpIgxmnNXlCk6wyC/EBqzpTW5yxXqs4JQe8du4vfMIfib6 GNG+xedWCKjKd2egCWOQ3Ipj37lDXv4GVM3tpFaQAwYzXkqx132xq1AqURSam93A7zTlNbODH/b RPC0fZeGg00FvoC84emnESj1dS7E/FFYeDKEMqv7XfTXwu55eO1/2lPv7jbw2gcGmDj+ZXBGIEl 6I6Lp0rg2gT7XbGPzLpTQ7K3CFpmt3yWNsnuzChphZ2ehT/bQkiWapBFXHMeSeQLgmHS5938Kgm q5c4A== X-Google-Smtp-Source: AGHT+IEAHTrmNmaP3m3VEtqo79dhNwcGcH7eucevY9b7r/Jawtg1SaqXgXIrUAyd/jj1AKZhz7HNyw== X-Received: by 2002:a05:600c:3541:b0:477:9650:3184 with SMTP id 5b1f17b1804b1-477c0165bc3mr213171935e9.2.1764211098387; Wed, 26 Nov 2025 18:38:18 -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-4790552c3c9sm58186345e9.0.2025.11.26.18.38.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 18:38:16 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Milan Zamazal , Bryan O'Donoghue Subject: [PATCH v5 16/24] libcamera: software_isp: GPU support for unpacked 10/12-bit formats Date: Thu, 27 Nov 2025 02:37:31 +0000 Message-ID: <20251127023739.179652-17-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251127023739.179652-1-bryan.odonoghue@linaro.org> References: <20251127023739.179652-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" From: Milan Zamazal The GPU processing supports 8-bit sensor formats and 10/12-bit packed formats. Support for 10/12-bit unpacked formats is missing, let's add it. 10/12-bit unpacked formats use two adjacent bytes to store the value. This means the 8-bit shaders can be used if we can modify them for additional support of 16-bit addressing. This requires the following modifications: - Using GL_RG (two bytes per pixel) instead of GL_LUMINANCE (one byte per pixel) as the texture format for the given input formats. - Setting the texture width to the number of pixels rather than the number of bytes. - Making the definition of `fetch' macro variable, according to the pixel format. - Using only `fetch' for accessing the texture. Signed-off-by: Milan Zamazal Signed-off-by: Bryan O'Donoghue --- src/libcamera/shaders/bayer_unpacked.frag | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/libcamera/shaders/bayer_unpacked.frag b/src/libcamera/shaders/bayer_unpacked.frag index 43ed99e33..7f24fe954 100644 --- a/src/libcamera/shaders/bayer_unpacked.frag +++ b/src/libcamera/shaders/bayer_unpacked.frag @@ -47,9 +47,17 @@ float apply_contrast(float normalise, float contrast_in) void main(void) { vec3 rgb; + #if defined(RAW10P) + #define pixel(p) p.r / 4.0 + p.g * 64.0 + #define fetch(x, y) pixel(texture2D(tex_y, vec2(x, y))) + #elif defined(RAW12P) + #define pixel(p) p.r / 16.0 + p.g * 16.0 + #define fetch(x, y) pixel(texture2D(tex_y, vec2(x, y))) + #else #define fetch(x, y) texture2D(tex_y, vec2(x, y)).r + #endif - float C = texture2D(tex_y, center.xy).r; // ( 0, 0) + float C = fetch(center.x, center.y); // ( 0, 0) const vec4 kC = vec4( 4.0, 6.0, 5.0, 5.0) / 8.0; // Determine which of four types of pixels we are on.