{"id":27003,"url":"https://patchwork.libcamera.org/api/1.1/patches/27003/?format=json","web_url":"https://patchwork.libcamera.org/patch/27003/","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":"<20260621-kbingham-awb-saturation-v1-7-b91ea59c6cfb@ideasonboard.com>","date":"2026-06-20T23:00:34","name":"[7/7] shaders: bayer: Use native matrix multiplication","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"813f8c965c00be8395e03fb561c99ac1cc078efc","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/27003/mbox/","series":[{"id":6009,"url":"https://patchwork.libcamera.org/api/1.1/series/6009/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=6009","date":"2026-06-20T23:00:27","name":"softisp: Fix Saturation and Black level handling","version":1,"mbox":"https://patchwork.libcamera.org/series/6009/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/27003/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/27003/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 20281C3303\n\tfor ;\n\tSat, 20 Jun 2026 23:00:50 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D0109656F1;\n\tSun, 21 Jun 2026 01:00:46 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 08420656E3\n\tfor ;\n\tSun, 21 Jun 2026 01:00:37 +0200 (CEST)","from [192.168.0.240]\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5331618E5;\n\tSun, 21 Jun 2026 01:00:00 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"hNOYGvmn\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1781996400;\n\tbh=/no/cZODy8Va4tcU7NE+8kpiju3sSy4KKajESvyHYLA=;\n\th=From:Date:Subject:References:In-Reply-To:To:Cc:From;\n\tb=hNOYGvmnk1K/wTNRY6yLDmOzQx7LkmheoPQMsvHeis4VWordHR8Y3W3wsEF42Sti5\n\tXza2vUjkwLeMLgjy3K9fYDapThI9u9XAtRW3tcVsUQD8+D9uAq1jfGos+ZA9asceNh\n\tQpABLyOG3MEigCpSZu77Z7Eff/O4vkDtGTGUv4zM=","From":"Kieran Bingham ","Date":"Sun, 21 Jun 2026 00:00:34 +0100","Subject":"[PATCH 7/7] shaders: bayer: Use native matrix multiplication","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Message-Id":"<20260621-kbingham-awb-saturation-v1-7-b91ea59c6cfb@ideasonboard.com>","References":"<20260621-kbingham-awb-saturation-v1-0-b91ea59c6cfb@ideasonboard.com>","In-Reply-To":"<20260621-kbingham-awb-saturation-v1-0-b91ea59c6cfb@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Cc":"Kieran Bingham ","X-Mailer":"b4 0.14.2","X-Developer-Signature":"v=1; a=ed25519-sha256; t=1781996434; l=6299;\n\ti=kieran.bingham@ideasonboard.com; s=20260204;\n\th=from:subject:message-id; \n\tbh=/no/cZODy8Va4tcU7NE+8kpiju3sSy4KKajESvyHYLA=;\n\tb=TQyiWYqBzG73gnXB6atj42B8Z78pCJk6BbEPzk3k+IDoJAUDIsS4H9/QtSf8xth6u/Z3aODG3\n\t07D7nfZx3BKAucGMglLJDHga3TF247rWNXbBgoS2BTVx2cdJwjILBH1","X-Developer-Key":"i=kieran.bingham@ideasonboard.com; a=ed25519;\n\tpk=IOxS2C6nWHNjLfkDR71Iesk904i6wJDfEERqV7hDBdY=","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":"Remove the open coded matrix multiplication as glsl can perform this\ndirectly. Adapt the uniform ccmUniformDataIn_ to ensure we correctly\nupload the matrix in row major ordering.\n\nSigned-off-by: Kieran Bingham \n---\n src/libcamera/shaders/bayer_1x_packed.frag | 45 ++----------------------------\n src/libcamera/shaders/bayer_unpacked.frag | 45 ++----------------------------\n src/libcamera/software_isp/debayer_egl.cpp | 13 +--------\n 3 files changed, 5 insertions(+), 98 deletions(-)","diff":"diff --git a/src/libcamera/shaders/bayer_1x_packed.frag b/src/libcamera/shaders/bayer_1x_packed.frag\nindex 6b3f7532c177f277e43c27e498dfadcb9cd4e26c..0b641a5f35c53a20811315c4e5def18f301cae69 100644\n--- a/src/libcamera/shaders/bayer_1x_packed.frag\n+++ b/src/libcamera/shaders/bayer_1x_packed.frag\n@@ -235,49 +235,8 @@ void main(void)\n \t/* Apply AWB gains, and saturate each channel at sensor range */\n \trgb = clamp(rgb * awb, vec3(0.0), vec3(1.0));\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+\t/* Colour Correction Matrix */\n+\trgb = ccm * rgb;\n \n \t/*\n \t * Contrast\ndiff --git a/src/libcamera/shaders/bayer_unpacked.frag b/src/libcamera/shaders/bayer_unpacked.frag\nindex 44535312125d0e7e5cca372f4e8e0f8ad9fce8b3..10c5e941b67c6409312d4091e54d87c1037fae32 100644\n--- a/src/libcamera/shaders/bayer_unpacked.frag\n+++ b/src/libcamera/shaders/bayer_unpacked.frag\n@@ -138,49 +138,8 @@ void main(void) {\n /* Apply AWB gains, and saturate each channel at sensor range */\n rgb = clamp(rgb * awb, vec3(0.0), vec3(1.0));\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+ /* Colour Correction Matrix */\n+ rgb = ccm * rgb;\n \n /*\n * Contrast\ndiff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp\nindex 6ba197966d85e1ab3bdc337b9e4ddeb20f1ec2fa..0ec2a98cfafbf87f4de8f160b7b779f61943d287 100644\n--- a/src/libcamera/software_isp/debayer_egl.cpp\n+++ b/src/libcamera/software_isp/debayer_egl.cpp\n@@ -486,18 +486,7 @@ void DebayerEGL::setShaderVariableValues(const DebayerParams ¶ms)\n \t\t\t << \" textureUniformStrideFactor_ \" << Stride\n \t\t\t << \" textureUniformProjMatrix_ \" << textureUniformProjMatrix_;\n \n-\tGLfloat ccm[9] = {\n-\t\tparams.combinedMatrix[0][0],\n-\t\tparams.combinedMatrix[0][1],\n-\t\tparams.combinedMatrix[0][2],\n-\t\tparams.combinedMatrix[1][0],\n-\t\tparams.combinedMatrix[1][1],\n-\t\tparams.combinedMatrix[1][2],\n-\t\tparams.combinedMatrix[2][0],\n-\t\tparams.combinedMatrix[2][1],\n-\t\tparams.combinedMatrix[2][2],\n-\t};\n-\tglUniformMatrix3fv(ccmUniformDataIn_, 1, GL_FALSE, ccm);\n+\tglUniformMatrix3fv(ccmUniformDataIn_, 1, GL_TRUE, params.combinedMatrix.data().data());\n \tLOG(Debayer, Debug) << \" ccmUniformDataIn_ \" << ccmUniformDataIn_ << \" data \" << params.combinedMatrix;\n \n \t/*\n","prefixes":["7/7"]}