From patchwork Wed Nov 18 09:57:27 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 28982 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 74A9BBDE17 for ; Wed, 18 Nov 2026 09:58:28 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B8AC86A90A; Wed, 18 Nov 2026 10:58:27 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="E6nGRrRb"; dkim-atps=neutral Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id F40A56A8C7 for ; Wed, 18 Nov 2026 10:58:09 +0100 (CET) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-498f5fa4f70so625376f8f.0 for ; Wed, 18 Nov 2026 01:58:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1794995889; x=1795600689; 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:content-type; bh=EAXfo5aTxuaRdwcl5F0KUKiTldHBFE8N/fKyXanghHI=; b=E6nGRrRb+DlZ/3USijQ0tHg0DZ7ahHtIZ8lAAAjaol130lKNJCpT5eZvJVyPQQHoE2 aSKtENylrEnOp9g3/CbW1PNCJ4HT0iwuCXY2Dr06k+tZtPgsG8OAXD/P0t/L5dq//xpX cpYKcyILZC2ya4E5DC93OdARysKmUl3lOebZnAA+JYGcRTugHseKC7UFmYwUx+dlSGkO sDIqoXQrDVlW29V0X2X3RLmN1FYgV8810K1uK2ekjNimbf4uLrTNeqzLfUXU3J62cACs VlXheCTAVPXPaRrK4uig13VxCo1WNvVifpuajHngkkH8rX5bCvjYNW1UnLhXalCj4weU bBTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794995889; x=1795600689; 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:content-type; bh=EAXfo5aTxuaRdwcl5F0KUKiTldHBFE8N/fKyXanghHI=; b=EGqJ0Skaun8UFzAyB+nP7wvefG55UYD3l/tF4Rtge5bzVpE7oqNR34I7nMqMIneDth jC6HLqo3u/2YpNVkNH3yGz9w7sGrtKlOZutmuYwj/Zgz69OH48yuRy3sjiDu0T+hnobE ClxcEqQm0Un/SoD6+dxvuY/bt2rPnm0rdFVG8lipQFM6RR8RrelpLQbKBo4fHePfQCM6 p5Qb/+IQh6JhtB3aV7GIxECT+XtewTQbKojaX9U54QgvKdTbjltNlGKUMhN9+1nfSHW/ haalSmeY6NMErvqgs/XdJPnNFUrl7UfsIj+lPPu8aUI2h6XaWiezdq8ZnkOpadNMWzL9 otCA== X-Gm-Message-State: APuU4Z/TxdHC7VzlGQGwq+Z8J4dKXWVpOZPRizu6ATpHo1yN8daLADTe OPg35JIzWzi4dgazoOc82yMxRyEhOfNTf1QLxW4Bh0FbU71dk2P2zf/i2i7hXNmH8wvDrJIhRJr N1EcEIGg= X-Gm-Gg: AZFdTZfGuMULYGNke+c8vjn43DY3T9ZKZE2KVV7RQk/SJG5xWv5LB68yzH5fHJYFJN+ vrhbz+/ore6lDa5zaJF7Yxk5ZU+DEo3yzez6UFw8fq497kdQRYa2H29IdJd/7FnWUcavE6SPX6n UkAPGqXOd67oRN1u4bJASgURAHTVlUitqp/7MpOe6XqcIofvwKDTDZ3VcldsRFxv2sIt72AKUN3 dy1rGnt9lNOAzMuGbvOSV2+1o+zb4kMbnHWcFngbjhT9xh4suID7ByjOuWEb6sYQ51occ0+aOFL j8mXFEISXUIb7J/eXGes6GN+ms1NQkSM6qPrf154BN0y4SSMKEYCYNTTdrraA1gXbGEKdqbBA9u xmvmy/xJ/djlPFwOy/VkCq3IjJn0cyapyvP3ejRnKZlNLcj0n4GhvZ7gCdyDnkCCklqgKEZgfJL +bKR/4oVt7JQV1LYzKnQ9Vvg+4umgkteR6Lbew1QVIGIlU8zUYCPUVlJMudnr0TbVfb+jaRzglj T7FyqUu7T96rwteFMtL35XIZ8Rx1fK1EZjwaKHCErGqmX3VhFV+Xis8rSvR/ozVcYeZVjn9keuD 2yrQss0dvGVk+6gb8NijvO5fuYFm+RMLNMrErRLMAVOC1Newv537X+iBmUWoVQZly2w= X-Received: by 2002:a05:6000:470b:b0:4a4:368:409d with SMTP id ffacd0b85a97d-4a633785fc0mr4494571f8f.3.1794995889494; Wed, 18 Nov 2026 01:58:09 -0800 (PST) Received: from inspiron14p-linux ([109.76.187.112]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4a655f9f4a7sm3940871f8f.34.2026.11.18.01.58.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2026 01:58:08 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: rstrode@redhat.com, robert.mader@collabora.com, barnabas.pocze@ideasonboard.com, Bryan O'Donoghue Subject: [RFC PATCH v2 20/26] libcamera: shaders: bayer_glr16_to_rgba.frag: Sample pixels into a structure Date: Wed, 18 Nov 2026 10:57:27 +0100 Message-ID: <20261118095735.170587-21-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261118095735.170587-1-bryan.odonoghue@linaro.org> References: <20261118095735.170587-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" Sample the raw bayer pixels into a structure. This makes the code a bit more readable and sets us up for fetching pixels once in the code when doing statistics. Signed-off-by: Bryan O'Donoghue --- .../shaders/bayer_glr16f_to_rgba.frag | 64 +++++++++++++------ 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/src/libcamera/shaders/bayer_glr16f_to_rgba.frag b/src/libcamera/shaders/bayer_glr16f_to_rgba.frag index 0b2db1d7a..ce334de48 100644 --- a/src/libcamera/shaders/bayer_glr16f_to_rgba.frag +++ b/src/libcamera/shaders/bayer_glr16f_to_rgba.frag @@ -28,6 +28,12 @@ uniform mat3 ccm; uniform float gamma; uniform float contrastExp; +struct samples_3x3 { + float row0a, row0b, row0c; + float row1a, center, row1c; + float row2a, row2b, row2c; +}; + float apply_contrast(float value) { // Apply simple S-curve @@ -42,10 +48,26 @@ float fetch(float x, float y) return texture2D(tex_y, vec2(x, y)).r; } +void sample_3x3(inout samples_3x3 samples) +{ + samples.row0a = fetch(xCoord[1], yCoord[2]); + samples.row0b = fetch(center.x, yCoord[2]); + samples.row0c = fetch(xCoord[2], yCoord[2]); + samples.row1a = fetch(xCoord[1], center.y); + samples.center = fetch(center.x, center.y); + samples.row1c = fetch(xCoord[2], center.y); + samples.row2a = fetch(xCoord[1], yCoord[1]); + samples.row2b = fetch(center.x, yCoord[1]); + samples.row2c = fetch(xCoord[2], yCoord[1]); +} + void main(void) { + samples_3x3 samples; vec3 rgb; - float C = fetch(center.x, center.y); // ( 0, 0) + sample_3x3(samples); + + float C = samples.center; /* Which of the four CFA phases are we on (0 = even). Same as McGuire. */ vec2 alternate = mod(floor(center.zw), 2.0); @@ -53,36 +75,36 @@ void main(void) { bool even_row = alternate.y < 1.0; /* - * +----+----+----+ - * | D2 | A1 | D3 | - * +----+----+----+ - * | B0 | C | B1 | - * +----+----+----+ - * | D0 | A0 | D1 | - * +----+----+----+ + * +-------+-------+-------+ + * | row0a | row0b | row0c | + * +-------+-------+-------+ + * | row1a | center| row1c | + * +-------+-------+-------+ + * | row2a | row2b | row2c | + * +-------+-------+-------+ * - * patterns.x = (A0 + A1) / 2 vertical neighbours - * patterns.y = (B0 + B1) / 2 horizontal neighbours - * patterns.z = (A0+A1+B0+B1) / 4 cross average (green at R/B sites) - * patterns.w = (D0+D1+D2+D3) / 4 diagonal average (other colour at R/B sites) + * patterns.x = (row2b + row0b) / 2 vertical neighbours + * patterns.y = (row1a + row1c) / 2 horizontal neighbours + * patterns.z = (row2b + row0b + row1a + row1c) / 4 cross average (green at R/B sites) + * patterns.w = (row2a + row2c + row0a + row0c) / 4 diagonal average (other colour at R/B sites) * * xCoord[1] = -1, xCoord[2] = +1, yCoord[1] = -1, yCoord[2] = +1 * (xCoord[0]/[3] and yCoord[0]/[3] = +-2 are unused here; the vertex * shader still emits them so the VS is identical to the McGuire path). */ vec4 patterns = vec4( - fetch(center.x, yCoord[1]), /* A0: ( 0,-1) */ - fetch(xCoord[1], center.y), /* B0: (-1, 0) */ - fetch(xCoord[1], yCoord[1]), /* D0: (-1,-1) */ - fetch(xCoord[2], yCoord[1])); /* D1: ( 1,-1) */ + samples.row2b, /* row2b: ( 0,-1) */ + samples.row1a, /* row1a: (-1, 0) */ + samples.row2a, /* row2a: (-1,-1) */ + samples.row2c); /* row2c: ( 1,-1) */ vec4 temp = vec4( - fetch(center.x, yCoord[2]), /* A1: ( 0, 1) */ - fetch(xCoord[2], center.y), /* B1: ( 1, 0) */ - fetch(xCoord[2], yCoord[2]), /* D3: ( 1, 1) */ - fetch(xCoord[1], yCoord[2])); /* D2: (-1, 1) */ + samples.row0b, /* row0b: ( 0, 1) */ + samples.row1c, /* row1c: ( 1, 0) */ + samples.row0c, /* row0c: ( 1, 1) */ + samples.row0a); /* row0a: (-1, 1) */ patterns = (patterns + temp) * 0.5; - /* .x=(A0+A1)/2 .y=(B0+B1)/2 .z=(D0+D3)/2 .w=(D1+D2)/2 */ + /* .x=(row2b+row0b)/2 .y=(row1a+row1c)/2 .z=(row2a+row0c)/2 .w=(row2c+row0a)/2 */ patterns.w = (patterns.z + patterns.w) * 0.5; /* diagonal avg */ patterns.z = (patterns.x + patterns.y) * 0.5; /* cross avg */