{"id":25243,"url":"https://patchwork.libcamera.org/api/1.1/patches/25243/?format=json","web_url":"https://patchwork.libcamera.org/patch/25243/","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":"<20251127023739.179652-7-bryan.odonoghue@linaro.org>","date":"2025-11-27T02:37:21","name":"[v5,06/24] libcamera: shaders: Extend debayer shaders to apply RGB gain values on output","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"f9b8bf423cc1fcc49e5d7ff11e5511536594e326","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/25243/mbox/","series":[{"id":5617,"url":"https://patchwork.libcamera.org/api/1.1/series/5617/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5617","date":"2025-11-27T02:37:15","name":"Add GLES 2.0 GPUISP to libcamera","version":5,"mbox":"https://patchwork.libcamera.org/series/5617/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25243/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25243/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 ED252C3257\n\tfor ;\n\tThu, 27 Nov 2025 02:38:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8207560A8B;\n\tThu, 27 Nov 2025 03:38:00 +0100 (CET)","from mail-wm1-x334.google.com (mail-wm1-x334.google.com\n\t[IPv6:2a00:1450:4864:20::334])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DC1C7609DE\n\tfor ;\n\tThu, 27 Nov 2025 03:37:59 +0100 (CET)","by mail-wm1-x334.google.com with SMTP id\n\t5b1f17b1804b1-4779cb0a33fso2934895e9.0\n\tfor ;\n\tWed, 26 Nov 2025 18:37:59 -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\t5b1f17b1804b1-4790552c3c9sm58186345e9.0.2025.11.26.18.37.57\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 26 Nov 2025 18:37:58 -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=\"wJ2aDUdV\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1764211079; x=1764815879;\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=e9cIZnLKMjoKTXRCg5aiS+zFbq3BqFPUvk7OeX1bh1o=;\n\tb=wJ2aDUdVEURmhk4MxHaW1IAPZjA1cWUJhsPAdT0xcj/ThsLMZ5FjYHqdiAnDyb38Nu\n\t8hg2kd5yZ00yISjR2DHabLzoy3AlEYqDJYalTEeGBWDxORW0fftHeAGUxSxW6cFl0vMn\n\tdqe9ATnhmrW+hVARTt6yTOC3HMeqPoX/3Q+CkXJpNDLaOkQggHNvtrxBPXyyeCMSfyaR\n\twf3pVEZam16tczaob5VmThhFvh1q2R3PnAYAhy9QeMKTWHk06J886F8AiXTeYQCH5jV+\n\tOWSuc1Ax1BGEX5csd/MaN37r9tuVXrWXKarRGvAkXFV1+gEOYSy6OHEi3NBwf1sQw8G5\n\t1OeQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1764211079; x=1764815879;\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=e9cIZnLKMjoKTXRCg5aiS+zFbq3BqFPUvk7OeX1bh1o=;\n\tb=Guoh1cyzkXhRibvcFJnreE3/KMg+HjhF/0wiPeLbRYvrQdT7GuIBrmPrJkhXKwtDMb\n\tkn7vkoTljLmJwNHOH644YXa8cPrzK0h++OhfCpqZQCXYYTtcWOF5PcBjDPIinleiH19+\n\tTHA8bW1AuFeN5iTisFSGYMYjGl5WbuCD0kENeXHW6tZK5slBz46JkmBFdBXdizyL+jTS\n\td8DoL/HSs7Jm1Ebm8VysKS52UB/vxvpwOWc6drdicOucHsesTGBwvodVayQFB6AeFa/5\n\tTMJI07kt765SZ8SVG18xfG9hdwQVdfPhBQ+bz/pEnn7LtppEPSifIRCNUIjbCBBOVvX3\n\tp3Iw==","X-Gm-Message-State":"AOJu0YzhEKGS5zZ4HKLqyf3uOpLvt7zz0vsAHBOBbDNBr9Wgu8KFUZrS\n\t9VvP6LXUsDiJd067kcelzKb+5O/RcgzBUwpzBxzImcmx9O4+OUl2qZ+6S7JeddF8wiPiGmFGVoJ\n\tJiaRGHjQ=","X-Gm-Gg":"ASbGncuS2O5UjOgwMn2P6ymvPh5PQrGRFEQLt1h1R0CkUnX/Byaoc3v9VtKdyLaIJTL\n\tFITifkUlo5x96cH1aFDA4NIvBRci1PCFjlTjRPKAjp27R4ZjTa5/88QEN/zsrpZJTXq9CfZxpCB\n\tJJeYI/rgUGGCwx+neJ2dRoNnZXD/IZLoeC0yNCkDbc2LN5YTr4dQgOpgfqnIziouQNUb8tcUAlz\n\tSE/6Kan+DzHiZo4I7Al4BTIkz9WEyGUlxmfdTdn2D9LrGTz9uugiKfbR24qVq+OwWb1mfKbjiYb\n\tyszpqCJECUSSLEmr8+wbOBcvDiiDXzu+vJxXabCbz2wa0KVqHTROAnz05NYhxRE7ugEZbA0sLv/\n\tZg4+olVOZ6bLRDR8srcfR2fN9a9TL3PvYfwUad1HNSTD5wSzN5pNcDXO/pB7BtzrnJX3MCRMsAj\n\tAEMg8XD7O5kdeb22ZdL9Fv5GXKDbHDq63UvdDV/pAAns6GNhNFR7+/DFHdzKbGJrRjlvQ=","X-Google-Smtp-Source":"AGHT+IFlikomhw7T7nYeCMvg7tDZh2fVX/tgwOtdygivyYRPqkLr4VDCaYkpQCbtXCrnjZqc1/ySVg==","X-Received":"by 2002:a05:600c:3110:b0:477:b734:8c52 with SMTP id\n\t5b1f17b1804b1-477c0185bebmr233215005e9.14.1764211079244; \n\tWed, 26 Nov 2025 18:37:59 -0800 (PST)","From":"Bryan O'Donoghue ","To":"libcamera-devel@lists.libcamera.org","Cc":"pavel@ucw.cz, Bryan O'Donoghue ,\n\tMilan Zamazal ","Subject":"[PATCH v5 06/24] libcamera: shaders: Extend debayer shaders to apply\n\tRGB gain values on output","Date":"Thu, 27 Nov 2025 02:37:21 +0000","Message-ID":"<20251127023739.179652-7-bryan.odonoghue@linaro.org>","X-Mailer":"git-send-email 2.51.2","In-Reply-To":"<20251127023739.179652-1-bryan.odonoghue@linaro.org>","References":"<20251127023739.179652-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 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\nReviewed-by: Milan Zamazal \nSigned-off-by: Bryan O'Donoghue \n---\n src/libcamera/shaders/bayer_1x_packed.frag | 56 +++++++++++++++++++\n src/libcamera/shaders/bayer_unpacked.frag | 62 +++++++++++++++++++++-\n 2 files changed, 117 insertions(+), 1 deletion(-)","diff":"diff --git a/src/libcamera/shaders/bayer_1x_packed.frag b/src/libcamera/shaders/bayer_1x_packed.frag\nindex 19b13ad08..90bd64570 100644\n--- a/src/libcamera/shaders/bayer_1x_packed.frag\n+++ b/src/libcamera/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/src/libcamera/shaders/bayer_unpacked.frag b/src/libcamera/shaders/bayer_unpacked.frag\nindex aa7a1b004..924c477de 100644\n--- a/src/libcamera/shaders/bayer_unpacked.frag\n+++ b/src/libcamera/shaders/bayer_unpacked.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 red_param;\n+uniform sampler2D green_param;\n+uniform sampler2D blue_param;\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 +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+ /*\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+#elif defined(APPLY_RGB_PARAMETERS)\n+ /* Apply bayer params */\n+ rgb.r = texture2D(red_param, vec2(rgb.r, 0.5)).r;\n+ rgb.g = texture2D(green_param, vec2(rgb.g, 0.5)).g;\n+ rgb.b = texture2D(blue_param, vec2(rgb.b, 0.5)).b;\n+#endif\n+\n+ gl_FragColor.rgb = rgb;\n }\n","prefixes":["v5","06/24"]}