{"id":25660,"url":"https://patchwork.libcamera.org/api/1.1/patches/25660/?format=json","web_url":"https://patchwork.libcamera.org/patch/25660/","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":"<20260106170059.56193-8-bryan.odonoghue@linaro.org>","date":"2026-01-06T17:00:42","name":"[v11,07/24] libcamera: shaders: Extend debayer shaders to apply CCM gains","commit_ref":"a4e82c950be0f3a06e6b6fe8970ff7b281ee146c","pull_url":null,"state":"accepted","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/25660/mbox/","series":[{"id":5689,"url":"https://patchwork.libcamera.org/api/1.1/series/5689/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5689","date":"2026-01-06T17:00:35","name":"Add GLES 2.0 GPUISP to libcamera","version":10,"mbox":"https://patchwork.libcamera.org/series/5689/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25660/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25660/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 81949BDCC0\n\tfor ;\n\tTue, 6 Jan 2026 17:01:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2AD6861FD8;\n\tTue, 6 Jan 2026 18:01:16 +0100 (CET)","from mail-wm1-x344.google.com (mail-wm1-x344.google.com\n\t[IPv6:2a00:1450:4864:20::344])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E18FD61FF4\n\tfor ;\n\tTue, 6 Jan 2026 18:01:11 +0100 (CET)","by mail-wm1-x344.google.com with SMTP id\n\t5b1f17b1804b1-477563e28a3so118815e9.1\n\tfor ;\n\tTue, 06 Jan 2026 09:01:11 -0800 (PST)","from inspiron14p-linux.ht.home (188-141-3-146.dynamic.upc.ie.\n\t[188.141.3.146]) by smtp.gmail.com with ESMTPSA id\n\tffacd0b85a97d-432bd0dadcfsm5515322f8f.3.2026.01.06.09.01.10\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 06 Jan 2026 09:01:10 -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=\"oUdIK4yz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1767718871; x=1768323671;\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=oUdIK4yzbMx259SE4ES9Qv6NSn+FjIRkPeATu8tA91bvOyqOOViBgdWTauZpZTHdkk\n\tniIe8I1Onvtm0hy/P3J4I0P/3FIY7P58GG8euYjZGYP5I6mbnmu7ajqeXcGRmt6GE+Ld\n\trUeHqQv9E2/FnArlb78O0QyusKotmN2np/rIevqmDNf6JN1hiUL/RZJDWa18GD+BOLPZ\n\tBWdeEzU/eKgY5tywd2ktdPLqR0uvuxo2auw1owhbHDWG1hlqGUdBkXvhxUl8RixHchSK\n\tSwAsHFwXln5QMyuVFw+f38srWZVjJhblVmZDNmJq8+wOXsaMP5Yx8Xd1nhuFUBfmsGtm\n\tqPzQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1767718871; x=1768323671;\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=EMqbq8JTKc0TC9osxJjkpngafoi9qxysH3YdftYoeEkzmXnZ3ZrgGdBJLZFCU+jmWr\n\tmOgOQ7DIftJRt71F4Vexn5khxEkdu2++DvBa4wOZg++jYgpMNefvhg18u+kFZui/UgJh\n\tCkmG+OqaXGfyw7CsDJhcDF7iHU+cxQR596lqgCGV5873VxFnrv+PPyqr74z6EKJACKda\n\tvcc/9hPhK537HQOn5vrTlE0G+/qz/Jh/XBfL10JBzNLEkF8eqyGAUp8A/fx0l6WERAtr\n\tPkAbBsDpzaHrFweNpptS2CoHmyh+C4q3on2YCM/BGdWyNzjG6cUOheZKqbYmKgHz8Ewf\n\tXpNA==","X-Gm-Message-State":"AOJu0YxACYJ072j86j2BakbnkLDFFcK+hXrCa1z7K/k82zSueJkGO2QR\n\t/ib5sUg0H0j677P08qcJzST1r+e1rFoS8BhTx6SnkfSvNK8IazDPwGmVBxRi6ovwsHhVFa5BkcO\n\tDTr3SQnlz9A==","X-Gm-Gg":"AY/fxX6UNxAtEuP4nCtcgY1QZ6yXqGhUrivyn3N+hcRYKcBGPflGo+giWW8FxV5HJA9\n\trNJurawubz3kXYxlg+4NO2jlFQ6sIuzmc9jrc1i1dfPe5dsxrIpZiXXRJZ5Mz9JhLDuj12A4iRr\n\tkC9ueRmqQ9fCSjS53nkF542r5JFvrsQA9tstqjVvx1vs2NEJQ7rWKMVnhc7Z+UKSGC8jKBXz3If\n\t3bQ8uNrM2jTGFRtLtLyimc+wxsS83ZhiDu8YaXUvKjr6xd5CZ48FA5oBwFnakjYUtu9TI1O6t55\n\tZ6M9JHK/ooIYYANZXQLxOPHTa81mujTSAI1SuEDIAJX7L6ZJYyXFO+5VjqlTNUfNH/UHyFUMNIt\n\tO95/+aXERfucRgjyT0+9OKyASfLa4Rd3kwEpm9CKznGbl1MuPZfGPC7kKlJcZ+IAYo6NTv6fox3\n\taf/JlEP9almszWF400rsBMSimnd2goPaD2XjttWlPvH5g77JFqPdA9mHE0L9GNSJqm8Do=","X-Google-Smtp-Source":"AGHT+IEWPolcrFllHr3v0D6uzYIpQTLfwLZCcALuhj+gPP98jVMpl1F+4EM2hYPqMYtYmPtqiFrmwg==","X-Received":"by 2002:a05:600c:46c3:b0:477:a2f7:74de with SMTP id\n\t5b1f17b1804b1-47d7f404854mr51238645e9.3.1767718871170; \n\tTue, 06 Jan 2026 09:01:11 -0800 (PST)","From":"Bryan O'Donoghue ","To":"libcamera-devel@lists.libcamera.org","Cc":"pavel@ucw.cz, Bryan O'Donoghue ,\n\tMilan Zamazal ","Subject":"[PATCH v11 07/24] libcamera: shaders: Extend debayer shaders to\n\tapply CCM gains","Date":"Tue, 6 Jan 2026 17:00:42 +0000","Message-ID":"<20260106170059.56193-8-bryan.odonoghue@linaro.org>","X-Mailer":"git-send-email 2.52.0","In-Reply-To":"<20260106170059.56193-1-bryan.odonoghue@linaro.org>","References":"<20260106170059.56193-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":["v11","07/24"]}