{"id":24211,"url":"https://patchwork.libcamera.org/api/1.1/patches/24211/?format=json","web_url":"https://patchwork.libcamera.org/patch/24211/","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":"<20250824-b4-v0-5-2-gpuisp-v2-a-v2-28-96f4576c814e@linaro.org>","date":"2025-08-24T00:48:40","name":"[v2,28/37] libcamera: shaders: Extend debayer shaders to apply RGB gain values on output","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"5290c735a2f3d62ae5d5ae291ad236b491a91894","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/24211/mbox/","series":[{"id":5400,"url":"https://patchwork.libcamera.org/api/1.1/series/5400/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5400","date":"2025-08-24T00:48:12","name":"Add GLES 2.0 GPUISP to libcamera","version":2,"mbox":"https://patchwork.libcamera.org/series/5400/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/24211/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24211/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 8D48BBEFBE\n\tfor ;\n\tSun, 24 Aug 2025 00:49:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 10EC36931C;\n\tSun, 24 Aug 2025 02:49:36 +0200 (CEST)","from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com\n\t[IPv6:2a00:1450:4864:20::42e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C33BA69319\n\tfor ;\n\tSun, 24 Aug 2025 02:49:01 +0200 (CEST)","by mail-wr1-x42e.google.com with SMTP id\n\tffacd0b85a97d-3c8b0f1b699so53779f8f.0\n\tfor ;\n\tSat, 23 Aug 2025 17:49:01 -0700 (PDT)","from [192.168.0.13] (188-141-3-146.dynamic.upc.ie. [188.141.3.146])\n\tby smtp.gmail.com with ESMTPSA id\n\t5b1f17b1804b1-45b4e1d530esm69347225e9.0.2025.08.23.17.49.00\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 23 Aug 2025 17:49:00 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"tS61ZYPl\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1755996541; x=1756601341;\n\tdarn=lists.libcamera.org; \n\th=cc:to:in-reply-to:references:message-id:content-transfer-encoding\n\t:mime-version:subject:date:from:from:to:cc:subject:date:message-id\n\t:reply-to; bh=ifoFUbMkssRsOpI6z9cjwZnmKjTOulEJYtGZzT5bor4=;\n\tb=tS61ZYPlTM8fBrMjkJSrVXfP3GPwC6Y4yNq12vnqC/hb3WEFaywfy9JMUhuOpdJV3K\n\twXgpWzTt9wUibmLU/xXrtPMjcAtMhL30eJ4KE13W5YorMmtBqDx+oE5JhRVH++Q/ypkp\n\tOX3wzmhm1a7zBLmYAcvc1FmYz1rJu5bYMqCPPD9DbpMcw9k6PNOfVAA6BOWVINdxlaYO\n\twz1dz0OjNr0hk7wBXyF1aqt5caSlhig5u9IG97iVZ1HdknDOPY9NjZPhQG7wKjRSLf11\n\tVQ2qXqqpMGo+HubQcyX9slEm4GfoxXVKNKIkS0Um/uqf1CUUDXJwiWagrPsXUMehEsvA\n\t15/A==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1755996541; x=1756601341;\n\th=cc:to:in-reply-to:references:message-id:content-transfer-encoding\n\t:mime-version:subject:date:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=ifoFUbMkssRsOpI6z9cjwZnmKjTOulEJYtGZzT5bor4=;\n\tb=P47TuPLhxLXb6XYEqkmDEmH0NvCXVm3UQz+D5S4vKPEGGmhoptsL+HHcGSOI5lNisv\n\t6tQPB53SRpM7cJcX+Rq0KSeCxJ35Cq+tfLCfj+sAV+ilX/LZqa7jxWe9mTDBZzn43kyk\n\tysnOhfWS/oEWtg64r1vVKlpx424XG4D7DECXF29n6DGGsengJWTcu/9CnCJFq49zQeOY\n\tf4uJbYzWnCPBxnvqjx54QA0naxB4/E39JdTRmOzd02wtPwsX+ebeumVdVwd6EtZRWPTu\n\tszGMb3FWymu3UCcXtfTUMIqGx0hAgVMVRIOoc7BtE3vtJ/paG7zwqCKJ4SgrW68+AUev\n\tr0qQ==","X-Gm-Message-State":"AOJu0YznK3HFMpC+LVU4w5liEwVAimhApaKnypxdJE4SB4RaptIgW/Um\n\tXpJwjNDsrj7Hx+Vpuy4nSoIMHEOLlC0CEK3gY5/Sz++N0rNQRy/VMerE+fnZMJgLMif6oKhwFEK\n\tf48Wdf4E=","X-Gm-Gg":"ASbGnctZPNA71Eb7wQud5PipcJ0k61qIUT6gp313j1ny3v4v8zOnNwGFYRAsGhvJaZa\n\tHRoQbyDp70i/TnGOJ1qaWFH81blCwYCVfASrRhd8Edh/l/0RbsS86lf2tE4twEbxnSvI3eUikGf\n\toL/Bx4hJWp7yK6ks9MmjpTyN4FebhrNs4nxwPP3SvobIC2g1BV2nAIEmcR2Zrx3p22XWGhbgN/w\n\txSCt4Hikxcc6ny4FVQvoIAvpdBzFjPXZzpUPyWXCsYBOYpSjBjOoDGskF9k9Q8fd+Rf5R4KZzol\n\tBoZyDJDFpqwaHbOZW362E33yyucjDbXHKVteKr9noBj3WnHu6IGDAeqZUc2Av+gPypTcEHgw7TD\n\t0MNXXNpZlrarzKBLEdeFbnzYOy+r6xYiNNpZdbeXQFWdYcoqFYFWyR6hxvTJVTLkg419TjBJK44\n\tSS3/KBM2CO/IcF6qUy9qhtbhkNBgxmiZA=","X-Google-Smtp-Source":"AGHT+IGxDUQDr4z767fW5JA6YAXtWJp0dgbTAZjuzydKBP+XNgYFAOYSB7iZqn7hK5kXzHL9q5bILg==","X-Received":"by 2002:a5d:5d0a:0:b0:3b9:14f2:7eea with SMTP id\n\tffacd0b85a97d-3c5daefc2a3mr5291965f8f.18.1755996541133; \n\tSat, 23 Aug 2025 17:49:01 -0700 (PDT)","From":"Bryan O'Donoghue ","Date":"Sun, 24 Aug 2025 01:48:40 +0100","Subject":"[PATCH v2 28/37] libcamera: shaders: Extend debayer shaders to\n\tapply RGB gain values on output","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Message-Id":"<20250824-b4-v0-5-2-gpuisp-v2-a-v2-28-96f4576c814e@linaro.org>","References":"<20250824-b4-v0-5-2-gpuisp-v2-a-v2-0-96f4576c814e@linaro.org>","In-Reply-To":"<20250824-b4-v0-5-2-gpuisp-v2-a-v2-0-96f4576c814e@linaro.org>","To":"libcamera-devel@lists.libcamera.org","Cc":"Bryan O'Donoghue ","X-Mailer":"b4 0.14.2","X-Developer-Signature":"v=1; a=openpgp-sha256; l=6534;\n\ti=bryan.odonoghue@linaro.org; h=from:subject:message-id;\n\tbh=lmx/VP/ABJfrY2JJzolQMppLP6ALvW2gpux/pMgOaa8=;\n\tb=owEBbQKS/ZANAwAKASJxO7Ohjcg6AcsmYgBoqmFh30aFF5nA+PO59kP1VAPh0aeS/uNxVvVVx\n\tx23u2+RqISJAjMEAAEKAB0WIQTmk/sqq6Nt4Rerb7QicTuzoY3IOgUCaKphYQAKCRAicTuzoY3I\n\tOhhnD/wPl+G04cCfWRvy7BJeGqkzxWRAEehCfq22RsUCAOn2aVSjmTi7YwciEAluk0352Z9ZfCB\n\tEpNFYhLKoBHL1YzPK048sI3QTuH7bVKP68MiYLgsxT3LLLLcFwuzZSJN4ZiuvJrg0HK2mORWmDo\n\t/jDba+EpGYVgpDYpGvcyqntx4PtrY9b+HuZmfe5UxC98206BVFNYokJR+1ApZjxjJgKN2X5jE1B\n\taLdoZ+lWR5EURIpJ0XOnefIG/8oXj7LlMJ/9+sz70zaI9LAuhhmKwKFM8ZS4dPp5yKaWp0ccttb\n\tCZHw92qQ8mZVGQ1capeepvsZ6R3NQ6bI4MpBp1/SMI+eZqjCbwGp+RTq3VB75swhiBQD4ZHfJUO\n\tCRb4lYXqzPQgclVwk4EzzwtHhd949fGfETxEoCMGGCOjdx3FXG8KzsjNyHxen/qpyTzrmdqamtJ\n\tESuOXYPM18ErQtpSlOWCnVO02RIr8SK+9tZMKRIgtXb9xcegkdbM5fJf7UvmWjX1Eb6wyAx4Uki\n\t3aHC2DngWT7C2LduXr6kDSinPC2CtUgzStTo2SjJrlcr8tN2vhxot7P1O3znf15W18eaHztLQ9j\n\ttYs9e+sLwetk4bjAxW0FXdcz6YRcwbl26Tvkv4fConWzUaWQRe0Y6l1rdMX9jVHUoMkNlx/bKnB\n\tYfN4jwFPPeVd3+Q==","X-Developer-Key":"i=bryan.odonoghue@linaro.org; a=openpgp;\n\tfpr=E693FB2AABA36DE117AB6FB422713BB3A18DC83A","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 out the bayer fragment shaders to take 3 x 256 byte inputs as\ntextures from the CPU.\n\nWe then use an index to the table to recover the colour-corrected values\nprovided by the SoftIPA thread.\n\nSigned-off-by: Bryan O'Donoghue \n---\n .../internal/shaders/bayer_1x_packed.frag | 56 +++++++++++++++++++\n include/libcamera/internal/shaders/bayer_8.frag | 62 +++++++++++++++++++++-\n 2 files changed, 117 insertions(+), 1 deletion(-)","diff":"diff --git a/include/libcamera/internal/shaders/bayer_1x_packed.frag b/include/libcamera/internal/shaders/bayer_1x_packed.frag\nindex 19b13ad08b3a71e408774dbb8e75ca4e22d9ba8e..90bd645709e02d8cf9bee112b25cbb26c681db0a 100644\n--- a/include/libcamera/internal/shaders/bayer_1x_packed.frag\n+++ b/include/libcamera/internal/shaders/bayer_1x_packed.frag\n@@ -65,6 +65,10 @@ uniform vec2 tex_step;\n uniform vec2 tex_bayer_first_red;\n \n uniform sampler2D tex_y;\n+uniform sampler2D red_param;\n+uniform sampler2D green_param;\n+uniform sampler2D blue_param;\n+uniform mat3 ccm;\n \n void main(void)\n {\n@@ -212,5 +216,57 @@ void main(void)\n \t\t\tvec3(patterns.y, C, patterns.x) :\n \t\t\tvec3(patterns.wz, C));\n \n+#if defined(APPLY_CCM_PARAMETERS)\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+#elif defined(APPLY_RGB_PARAMETERS)\n+\t/* Apply bayer params */\n+\trgb.r = texture2D(red_param, vec2(rgb.r, 0.5)).r;\n+\trgb.g = texture2D(green_param, vec2(rgb.g, 0.5)).g;\n+\trgb.b = texture2D(blue_param, vec2(rgb.b, 0.5)).b;\n+#endif\n+\n \tgl_FragColor = vec4(rgb, 1.0);\n }\ndiff --git a/include/libcamera/internal/shaders/bayer_8.frag b/include/libcamera/internal/shaders/bayer_8.frag\nindex aa7a1b00436ae15d2ed6af7d666441d20db6bb0b..5955c2eafbe03678158b240740e18c7f00e58057 100644\n--- a/include/libcamera/internal/shaders/bayer_8.frag\n+++ b/include/libcamera/internal/shaders/bayer_8.frag\n@@ -21,11 +21,17 @@ precision highp float;\n \n /** Monochrome RGBA or GL_LUMINANCE Bayer encoded texture.*/\n uniform sampler2D tex_y;\n+uniform sampler2D\tred_param;\n+uniform sampler2D\tgreen_param;\n+uniform sampler2D\tblue_param;\n varying vec4 center;\n varying vec4 yCoord;\n varying vec4 xCoord;\n+uniform mat3\t\tccm;\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 +103,65 @@ 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+#if defined(APPLY_CCM_PARAMETERS)\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+#elif defined(APPLY_RGB_PARAMETERS)\n+\t/* Apply bayer params */\n+\trgb.r = texture2D(red_param, vec2(rgb.r, 0.5)).r;\n+\trgb.g = texture2D(red_param, vec2(rgb.g, 0.5)).g;\n+\trgb.b = texture2D(red_param, vec2(rgb.b, 0.5)).b;\n+#endif\n+\n+ gl_FragColor.rgb = rgb;\n }\n","prefixes":["v2","28/37"]}