{"id":25423,"url":"https://patchwork.libcamera.org/api/1.1/patches/25423/?format=json","web_url":"https://patchwork.libcamera.org/patch/25423/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20251210005354.44726-7-bryan.odonoghue@linaro.org>","date":"2025-12-10T00:53:34","name":"[v7,06/26] libcamera: shaders: Extend debayer shaders to apply CCM gains","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"3e8894e04ddf9a4e61feb6000701fa9f7c2bb1d3","submitter":{"id":175,"url":"https://patchwork.libcamera.org/api/1.1/people/175/?format=json","name":"Bryan O'Donoghue","email":"bryan.odonoghue@linaro.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/25423/mbox/","series":[{"id":5645,"url":"https://patchwork.libcamera.org/api/1.1/series/5645/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5645","date":"2025-12-10T00:53:28","name":"Add GLES 2.0 GPUISP to libcamera","version":7,"mbox":"https://patchwork.libcamera.org/series/5645/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25423/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25423/checks/","tags":{},"headers":{"Return-Path":"","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 7E29FC3257\n\tfor ;\n\tWed, 10 Dec 2025 00:54:37 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 37D7A6145B;\n\tWed, 10 Dec 2025 01:54:37 +0100 (CET)","from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com\n\t[IPv6:2607:f8b0:4864:20::1031])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B9EFE61455\n\tfor ;\n\tWed, 10 Dec 2025 01:54:34 +0100 (CET)","by mail-pj1-x1031.google.com with SMTP id\n\t98e67ed59e1d1-343dfb673a8so6347441a91.0\n\tfor ;\n\tTue, 09 Dec 2025 16:54:34 -0800 (PST)","from inspiron14p-linux (p96936b06.osaknt01.ap.so-net.ne.jp.\n\t[150.147.107.6]) by smtp.gmail.com with ESMTPSA id\n\t41be03b00d2f7-bf6875cc8eesm16057762a12.16.2025.12.09.16.54.31\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 09 Dec 2025 16:54:32 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"VSAwhN5Q\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1765328073; x=1765932873;\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=Zkzu0tqbzAOlMWvnkw6w2p9R2Nid+3zoTkR/m4lKMgE=;\n\tb=VSAwhN5QX9uW4aUsbeQ3VNTKywC/gzNYoUCNntTFQyhBrz9JUTHeGM0nlQ6NaG5eKE\n\tAavCsjbUKFwY1PyRoOKZSKJ2f3lE/mPvW5IC2xGhKmNJZ523tmOTeLqd/+6A+DAkoTOY\n\t5WUDIAOpx4TzW8D0z0umHo6JvbXvDFB1o4Swp8vVogyX5ixWJbxwaCv3r0GNIlGbhnrv\n\t7GYDX1wUvIHullXktt3S7HexpOjTrC/TnwW1tv+XGQ0U/2mRgxLWQzX0JGXid8ZFFgYV\n\tSOcrHMOesl4Smt8JrryoKFQT8CZnVzVweTr8/awrcrfmEJwHvG/XyJUwZ8QCB+JvI1tS\n\t14MQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1765328073; x=1765932873;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n\t:to:cc:subject:date:message-id:reply-to;\n\tbh=Zkzu0tqbzAOlMWvnkw6w2p9R2Nid+3zoTkR/m4lKMgE=;\n\tb=A0QRIRHBIb4TryBwNfdp+PepFahjkB/ElC9snyWC+MNiHzbUGDvWkpTK4M7A590qS1\n\thmG0zJvkZHmkQSuab7f0zobLGU8HJOzDtzSlSf6NJvSg4K9Rf/fUDJRflackNm80YZ8o\n\taS1D6BFWDh+8QmGCCvHMM1oA0RKQMTAp8RWyPtzzQwFDALrist65SIesqq8/VhITm3BL\n\tn23G4Wl9O7A/tB0yua4KRhsNkuRtpgQc8yW5Xx2gfGOJzFUrLbCFpPBD6/mcGHqKw+B6\n\tm8yylhhDMeV96LvV2lQU4vgWxbfKKNNpdP2r75GwoEaDOywmQq6peW46H00icE2HwmMB\n\tLkIA==","X-Gm-Message-State":"AOJu0YzqMnDHvnsCHzywaJQpSW1AevWhZZ/TowADzz2Z2ToUMIQ7toBe\n\tkl1s3vx3+felrcXkgHWlZhbLgWNgU4L6GeyUeJLTtefkEqky2MKsBVgI+/24bgrURIt6nGQ9X8d\n\tZyFmN","X-Gm-Gg":"AY/fxX6ukqeURvy27MKC39SPVCqEfyPvQzfH63PjePmECkezzGTUYELG9zKNCxkdzOB\n\t3aoTdUSC9sq6l0rfck1rTsl4p18kOpRyqBBh2+tjmb9FhFEpF9WzUa4ANGNqVWn6Hin2MeXGiei\n\te8ucyZcodITTCoSASPMiOylleusagUSujFgQBX17Wphh1Y8GCq0DD4aAtc3najJfWhEwwRKdE0T\n\t1yofyMJDUPVmZT1ouCY4epafrgP5vaHltWWVhs4TQYtKxX8Z1CrjzF7u3LijR6flDVBh0JWbpED\n\tCSGeesMPO2J2Kn7AZRqSSROOXQovIzjEaK1RkA7XTNIxo10fP6o4R1ZpYKTwZupCap09y+Gqz6/\n\tz1FFlorYmab3g1dbA/isHsMG5ZNwRrPNWjT3PMF9RfVYoc1AOYljNFkFzLdZ+zsBNR6A6c8NlA5\n\tXflwqEK6SRJQzGDiB6QbKOpdrzVT3Dk6GqUt8S9a62rnj9F92tQbDpBur6CR/0WSx9iUfPYWP2+\n\tlQ=","X-Google-Smtp-Source":"AGHT+IEpuFdNxVm32Uuv18a5IWYh2q1CtGDKWBV4FlyYhV34uV/yU00dkbpa/nKaoSOO/Mkiao0iqQ==","X-Received":"by 2002:a17:90b:3fc7:b0:341:a9e7:e5f9 with SMTP id\n\t98e67ed59e1d1-34a727161b6mr543228a91.0.1765328073020; \n\tTue, 09 Dec 2025 16:54:33 -0800 (PST)","From":"Bryan O'Donoghue ","To":"libcamera-devel@lists.libcamera.org","Cc":"pavel@ucw.cz, Bryan O'Donoghue ,\n\tMilan Zamazal ","Subject":"[PATCH v7 06/26] libcamera: shaders: Extend debayer shaders to apply\n\tCCM gains","Date":"Wed, 10 Dec 2025 00:53:34 +0000","Message-ID":"<20251210005354.44726-7-bryan.odonoghue@linaro.org>","X-Mailer":"git-send-email 2.52.0","In-Reply-To":"<20251210005354.44726-1-bryan.odonoghue@linaro.org>","References":"<20251210005354.44726-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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Extend Bayer shaders to support application of a passed CCM table.\n\nReviewed-by: Milan Zamazal \nSigned-off-by: Bryan O'Donoghue \n---\n src/libcamera/shaders/bayer_1x_packed.frag | 45 +++++++++++++++++++\n src/libcamera/shaders/bayer_unpacked.frag | 51 +++++++++++++++++++++-\n 2 files changed, 95 insertions(+), 1 deletion(-)","diff":"diff --git a/src/libcamera/shaders/bayer_1x_packed.frag b/src/libcamera/shaders/bayer_1x_packed.frag\nindex 19b13ad08..171a928c2 100644\n--- a/src/libcamera/shaders/bayer_1x_packed.frag\n+++ b/src/libcamera/shaders/bayer_1x_packed.frag\n@@ -65,6 +65,7 @@ uniform vec2 tex_step;\n uniform vec2 tex_bayer_first_red;\n \n uniform sampler2D tex_y;\n+uniform mat3 ccm;\n \n void main(void)\n {\n@@ -212,5 +213,49 @@ void main(void)\n \t\t\tvec3(patterns.y, C, patterns.x) :\n \t\t\tvec3(patterns.wz, C));\n \n+\t/*\n+\t * CCM is a 3x3 in the format\n+\t *\n+\t * +--------------+----------------+---------------+\n+\t * | RedRedGain | RedGreenGain | RedBlueGain |\n+\t * +--------------+----------------+---------------+\n+\t * | GreenRedGain | GreenGreenGain | GreenBlueGain |\n+\t * +--------------+----------------+---------------+\n+\t * | BlueRedGain | BlueGreenGain | BlueBlueGain |\n+\t * +--------------+----------------+---------------+\n+\t *\n+\t * Rout = RedRedGain * Rin + RedGreenGain * Gin + RedBlueGain * Bin\n+\t * Gout = GreenRedGain * Rin + GreenGreenGain * Gin + GreenBlueGain * Bin\n+\t * Bout = BlueRedGain * Rin + BlueGreenGain * Gin + BlueBlueGain * Bin\n+\t *\n+\t * We upload to the GPU without transposition glUniformMatrix3f(.., .., GL_FALSE, ccm);\n+\t *\n+\t * CPU\n+\t * float ccm [] = {\n+\t * RedRedGain, RedGreenGain, RedBlueGain,\n+\t * GreenRedGain, GreenGreenGain, GreenBlueGain,\n+\t * BlueRedGain, BlueGreenGain, BlueBlueGain,\n+\t * };\n+\t *\n+\t * GPU\n+\t * ccm = {\n+\t * RedRedGain, GreenRedGain, BlueRedGain,\n+\t * RedGreenGain, GreenGreenGain, BlueGreenGain,\n+\t * RedBlueGain, GreenBlueGain, BlueBlueGain,\n+\t * }\n+\t *\n+\t * However the indexing for the mat data-type is column major hence\n+\t * ccm[0][0] = RedRedGain, ccm[0][1] = RedGreenGain, ccm[0][2] = RedBlueGain\n+\t *\n+\t */\n+\tfloat rin, gin, bin;\n+\trin = rgb.r;\n+\tgin = rgb.g;\n+\tbin = rgb.b;\n+\n+\trgb.r = (rin * ccm[0][0]) + (gin * ccm[0][1]) + (bin * ccm[0][2]);\n+\trgb.g = (rin * ccm[1][0]) + (gin * ccm[1][1]) + (bin * ccm[1][2]);\n+\trgb.b = (rin * ccm[2][0]) + (gin * ccm[2][1]) + (bin * ccm[2][2]);\n+\n \tgl_FragColor = vec4(rgb, 1.0);\n }\ndiff --git a/src/libcamera/shaders/bayer_unpacked.frag b/src/libcamera/shaders/bayer_unpacked.frag\nindex aa7a1b004..c41d72f4f 100644\n--- a/src/libcamera/shaders/bayer_unpacked.frag\n+++ b/src/libcamera/shaders/bayer_unpacked.frag\n@@ -24,8 +24,11 @@ uniform sampler2D tex_y;\n varying vec4 center;\n varying vec4 yCoord;\n varying vec4 xCoord;\n+uniform mat3 ccm;\n \n void main(void) {\n+ vec3 rgb;\n+\n #define fetch(x, y) texture2D(tex_y, vec2(x, y)).r\n \n float C = texture2D(tex_y, center.xy).r; // ( 0, 0)\n@@ -97,11 +100,57 @@ void main(void) {\n PATTERN.xw += kB.xw * B;\n PATTERN.xz += kF.xz * F;\n \n- gl_FragColor.rgb = (alternate.y == 0.0) ?\n+ rgb = (alternate.y == 0.0) ?\n ((alternate.x == 0.0) ?\n vec3(C, PATTERN.xy) :\n vec3(PATTERN.z, C, PATTERN.w)) :\n ((alternate.x == 0.0) ?\n vec3(PATTERN.w, C, PATTERN.z) :\n vec3(PATTERN.yx, C));\n+\n+ /*\n+ * CCM is a 3x3 in the format\n+ *\n+ * +--------------+----------------+---------------+\n+ * | RedRedGain | RedGreenGain | RedBlueGain |\n+ * +--------------+----------------+---------------+\n+ * | GreenRedGain | GreenGreenGain | GreenBlueGain |\n+ * +--------------+----------------+---------------+\n+ * | BlueRedGain | BlueGreenGain | BlueBlueGain |\n+ * +--------------+----------------+---------------+\n+ *\n+ * Rout = RedRedGain * Rin + RedGreenGain * Gin + RedBlueGain * Bin\n+ * Gout = GreenRedGain * Rin + GreenGreenGain * Gin + GreenBlueGain * Bin\n+ * Bout = BlueRedGain * Rin + BlueGreenGain * Gin + BlueBlueGain * Bin\n+ *\n+ * We upload to the GPU without transposition glUniformMatrix3f(.., .., GL_FALSE, ccm);\n+ *\n+ * CPU\n+ * float ccm [] = {\n+ * RedRedGain, RedGreenGain, RedBlueGain,\n+ * GreenRedGain, GreenGreenGain, GreenBlueGain,\n+ * BlueRedGain, BlueGreenGain, BlueBlueGain,\n+ * };\n+ *\n+ * GPU\n+ * ccm = {\n+ * RedRedGain, GreenRedGain, BlueRedGain,\n+ * RedGreenGain, GreenGreenGain, BlueGreenGain,\n+ * RedBlueGain, GreenBlueGain, BlueBlueGain,\n+ * }\n+ *\n+ * However the indexing for the mat data-type is column major hence\n+ * ccm[0][0] = RedRedGain, ccm[0][1] = RedGreenGain, ccm[0][2] = RedBlueGain\n+ *\n+ */\n+ float rin, gin, bin;\n+ rin = rgb.r;\n+ gin = rgb.g;\n+ bin = rgb.b;\n+\n+ rgb.r = (rin * ccm[0][0]) + (gin * ccm[0][1]) + (bin * ccm[0][2]);\n+ rgb.g = (rin * ccm[1][0]) + (gin * ccm[1][1]) + (bin * ccm[1][2]);\n+ rgb.b = (rin * ccm[2][0]) + (gin * ccm[2][1]) + (bin * ccm[2][2]);\n+\n+ gl_FragColor.rgb = rgb;\n }\n","prefixes":["v7","06/26"]}