{"id":26730,"url":"https://patchwork.libcamera.org/api/patches/26730/?format=json","web_url":"https://patchwork.libcamera.org/patch/26730/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20260512123619.120068-8-mzamazal@redhat.com>","date":"2026-05-12T12:36:11","name":"[RFC,v5,07/10] libcamera: software_isp: debayer_egl: Add LSC support","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8198d115b458fd3dcee1e342eb3db4851f9e661c","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/26730/mbox/","series":[{"id":5936,"url":"https://patchwork.libcamera.org/api/series/5936/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5936","date":"2026-05-12T12:36:04","name":"LSC for SoftISP simple pipeline","version":5,"mbox":"https://patchwork.libcamera.org/series/5936/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/26730/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/26730/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 AAA73BDB1C\n\tfor ;\n\tTue, 12 May 2026 12:37:01 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4588F63029;\n\tTue, 12 May 2026 14:37:01 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D2AE563029\n\tfor ;\n\tTue, 12 May 2026 14:36:57 +0200 (CEST)","from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-10-AkWS2KKOPb-Co3KnkSUEoQ-1;\n\tTue, 12 May 2026 08:36:53 -0400","from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.17])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 0EC1918002DD; Tue, 12 May 2026 12:36:52 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.50.44])\n\tby mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 4B5421955D84; Tue, 12 May 2026 12:36:49 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"Z59OGY/x\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1778589416;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=izsKLgfMHPEegccl57RXD3w2QSLYKkSASbj7X/F09Lc=;\n\tb=Z59OGY/xhV8o2YKJXwH2+ARVX635kPr5zTOxIisuiej+KwWpf9/MwcgxMlsEErReJlPPMV\n\tQp2dp8GZ/WR9R/R6fjRq8qbz5t6OMetuVPSao5eiaZATHOXVDMeLESdPGMg8+1MdqZuNxf\n\tLGjgy3/5vfyaGvhixFqSEGZyCzFhYMA=","X-MC-Unique":"AkWS2KKOPb-Co3KnkSUEoQ-1","X-Mimecast-MFC-AGG-ID":"AkWS2KKOPb-Co3KnkSUEoQ_1778589412","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Xander Pronk ,\n\tBryan O'Donoghue ,\n\tHans de Goede ,\n\tLaurent Pinchart ,\n\tRick ten Wolde ,\n\tMilan Zamazal ","Subject":"[RFC PATCH v5 07/10] libcamera: software_isp: debayer_egl: Add LSC\n\tsupport","Date":"Tue, 12 May 2026 14:36:11 +0200","Message-ID":"<20260512123619.120068-8-mzamazal@redhat.com>","In-Reply-To":"<20260512123619.120068-1-mzamazal@redhat.com>","References":"<20260512123619.120068-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.17","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"eZFbXcWFi1Vw_gQcPIWxrwZcwQTGKlMRYa4w4R7xiIo_1778589412","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","content-type":"text/plain; charset=\"US-ASCII\"; x-default=true","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":"From: Xander Pronk \n\nAdd support for passing the LSC table from debayerParams to the shaders.\n\nThe LSC table values are floats, we must add `type' parameter to\ncreateTexture2D to support this. Moreover, we use 16-bit internal\nformat for the values, primarily because this works for me, unlike\n32-bit floats.\n\nCo-developed-by: Rick ten Wolde \nSigned-off-by: Rick ten Wolde \nSigned-off-by: Xander Pronk \nSigned-off-by: Milan Zamazal \n---\n include/libcamera/internal/egl.h | 10 +++++--\n .../internal/software_isp/debayer_params.h | 2 ++\n src/libcamera/egl.cpp | 16 ++++++++---\n src/libcamera/software_isp/debayer.cpp | 5 ++++\n src/libcamera/software_isp/debayer_egl.cpp | 28 +++++++++++++++++--\n src/libcamera/software_isp/debayer_egl.h | 5 ++++\n 6 files changed, 58 insertions(+), 8 deletions(-)","diff":"diff --git a/include/libcamera/internal/egl.h b/include/libcamera/internal/egl.h\nindex 6402dd5c7..3de47d970 100644\n--- a/include/libcamera/internal/egl.h\n+++ b/include/libcamera/internal/egl.h\n@@ -103,8 +103,14 @@ public:\n \n \tint createInputDMABufTexture2D(eGLImage &eglImage, int fd);\n \tint createOutputDMABufTexture2D(eGLImage &eglImage, int fd);\n-\tvoid createTexture2D(eGLImage &eglImage, GLint format, uint32_t width, uint32_t height,\n-\t\t\t const void *data, GLint filter);\n+\tvoid createTexture2D(eGLImage &eglImage,\n+\t\t\t GLint internalFormat,\n+\t\t\t GLint format,\n+\t\t\t GLenum type,\n+\t\t\t uint32_t width,\n+\t\t\t uint32_t height,\n+\t\t\t const void *data,\n+\t\t\t GLint filter);\n \n \tvoid pushEnv(std::vector &shaderEnv, const char *str);\n \tvoid makeCurrent();\ndiff --git a/include/libcamera/internal/software_isp/debayer_params.h b/include/libcamera/internal/software_isp/debayer_params.h\nindex 47f2c3ac2..5b1c8b508 100644\n--- a/include/libcamera/internal/software_isp/debayer_params.h\n+++ b/include/libcamera/internal/software_isp/debayer_params.h\n@@ -30,6 +30,8 @@ struct DebayerParams {\n \tstatic constexpr unsigned int kLscGridSize = 16;\n \tstatic constexpr unsigned int kLscValuesPerCell = 3;\n \tusing LscValueType = float;\n+\tstatic constexpr unsigned int kLscBytesPerCell =\n+\t\tkLscValuesPerCell * sizeof(LscValueType);\n \tusing LscLookupTable =\n \t\tstd::array;\n \tLscLookupTable lscLut{};\ndiff --git a/src/libcamera/egl.cpp b/src/libcamera/egl.cpp\nindex 80d71451f..cbd0a0d81 100644\n--- a/src/libcamera/egl.cpp\n+++ b/src/libcamera/egl.cpp\n@@ -207,7 +207,9 @@ int eGL::createOutputDMABufTexture2D(eGLImage &eglImage, int fd)\n /**\n * \\brief Create a 2D texture from a memory buffer\n * \\param[in,out] eglImage EGL image to associate with the texture\n- * \\param[in] format OpenGL internal format (e.g., GL_RGB, GL_RGBA)\n+ * \\param[in] internalFormat OpenGL internal storage format (e.g., GL_RGB8, GL_RGBA8)\n+ * \\param[in] format OpenGL pixel data format (e.g., GL_RGB, GL_RGBA)\n+ * \\param[in] type OpenGL pixel data type (e.g., GL_UNSIGNED_BYTE, GL_FLOAT)\n * \\param[in] width Texture width in pixels\n * \\param[in] height Texture height in pixels\n * \\param[in] data Pointer to pixel data, or nullptr for uninitialised texture\n@@ -218,8 +220,14 @@ int eGL::createOutputDMABufTexture2D(eGLImage &eglImage, int fd)\n * is useful for uploading static data like lookup tables or uniform color\n * matrices to the GPU.\n */\n-void eGL::createTexture2D(eGLImage &eglImage, GLint format, uint32_t width, uint32_t height,\n-\t\t\t const void *data, GLint filter)\n+void eGL::createTexture2D(eGLImage &eglImage,\n+\t\t\t GLint internalFormat,\n+\t\t\t GLint format,\n+\t\t\t GLenum type,\n+\t\t\t uint32_t width,\n+\t\t\t uint32_t height,\n+\t\t\t const void *data,\n+\t\t\t GLint filter)\n {\n \tASSERT(tid_ == Thread::currentId());\n \n@@ -227,7 +235,7 @@ void eGL::createTexture2D(eGLImage &eglImage, GLint format, uint32_t width, uint\n \tglBindTexture(GL_TEXTURE_2D, eglImage.texture_);\n \n \t// Generate texture, bind, associate image to texture, configure, unbind\n-\tglTexImage2D(GL_TEXTURE_2D, 0, format, width, height, 0, format, GL_UNSIGNED_BYTE, data);\n+\tglTexImage2D(GL_TEXTURE_2D, 0, internalFormat, width, height, 0, format, type, data);\n \n \t// Nearest filtering\n \tglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter);\ndiff --git a/src/libcamera/software_isp/debayer.cpp b/src/libcamera/software_isp/debayer.cpp\nindex 76c66e55b..cc1dbb2d0 100644\n--- a/src/libcamera/software_isp/debayer.cpp\n+++ b/src/libcamera/software_isp/debayer.cpp\n@@ -58,6 +58,11 @@ namespace libcamera {\n * \\brief Type of LSC grid values\n */\n \n+/**\n+ * \\var DebayerParams::kLscBytesPerCell\n+ * \\brief Number of bytes per each of the lens shading grid areas\n+ */\n+\n /**\n * \\typedef DebayerParams::LscLookupTable\n * \\brief Lookup table for lens shading correction\ndiff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp\nindex dc77d0ac6..293ec2499 100644\n--- a/src/libcamera/software_isp/debayer_egl.cpp\n+++ b/src/libcamera/software_isp/debayer_egl.cpp\n@@ -115,6 +115,8 @@ int DebayerEGL::getShaderVariableLocations(void)\n \ttextureUniformBayerFirstRed_ = glGetUniformLocation(programId_, \"tex_bayer_first_red\");\n \ttextureUniformProjMatrix_ = glGetUniformLocation(programId_, \"proj_matrix\");\n \n+\ttextureUniformLsc_ = glGetUniformLocation(programId_, \"lsc_tex\");\n+\n \tLOG(Debayer, Debug) << \"vertexIn \" << attributeVertex_ << \" textureIn \" << attributeTexture_\n \t\t\t << \" tex_y \" << textureUniformBayerDataIn_\n \t\t\t << \" ccm \" << ccmUniformDataIn_\n@@ -125,7 +127,8 @@ int DebayerEGL::getShaderVariableLocations(void)\n \t\t\t << \" tex_size \" << textureUniformSize_\n \t\t\t << \" stride_factor \" << textureUniformStrideFactor_\n \t\t\t << \" tex_bayer_first_red \" << textureUniformBayerFirstRed_\n-\t\t\t << \" proj_matrix \" << textureUniformProjMatrix_;\n+\t\t\t << \" proj_matrix \" << textureUniformProjMatrix_\n+\t\t\t << \" lsc \" << textureUniformLsc_;\n \treturn 0;\n }\n \n@@ -144,6 +147,9 @@ int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputForm\n \t/* Specify GL_OES_EGL_image_external */\n \tegl_.pushEnv(shaderEnv, \"#extension GL_OES_EGL_image_external: enable\");\n \n+\tif (lscEnabled_)\n+\t\tegl_.pushEnv(shaderEnv, \"#define APPLY_LSC\");\n+\n \t/*\n \t * Tell shaders how to re-order output taking account of how the pixels\n \t * are actually stored by EGL.\n@@ -343,6 +349,17 @@ int DebayerEGL::configure(const StreamConfiguration &inputCfg,\n \t */\n \tstats_->setWindow(Rectangle(window_.size()));\n \n+\tif (lscEnabled_) {\n+\t\tconstexpr unsigned int gridSize = DebayerParams::kLscGridSize;\n+\t\tconst unsigned int stride = gridSize * DebayerParams::kLscBytesPerCell;\n+\t\teglImageLscLookup_ =\n+\t\t\tstd::make_unique(gridSize,\n+\t\t\t\t\t\t gridSize,\n+\t\t\t\t\t\t stride,\n+\t\t\t\t\t\t GL_TEXTURE2,\n+\t\t\t\t\t\t 2);\n+\t}\n+\n \treturn 0;\n }\n \n@@ -482,6 +499,13 @@ void DebayerEGL::setShaderVariableValues(const DebayerParams ¶ms)\n \tglUniformMatrix3fv(ccmUniformDataIn_, 1, GL_FALSE, ccm);\n \tLOG(Debayer, Debug) << \" ccmUniformDataIn_ \" << ccmUniformDataIn_ << \" data \" << params.combinedMatrix;\n \n+\tif (lscEnabled_) {\n+\t\tegl_.createTexture2D(*eglImageLscLookup_, GL_RGB16F, GL_RGB, GL_FLOAT,\n+\t\t\t\t DebayerParams::kLscGridSize, DebayerParams::kLscGridSize,\n+\t\t\t\t params.lscLut.data(), GL_LINEAR);\n+\t\tglUniform1i(textureUniformLsc_, eglImageLscLookup_->texture_unit_uniform_id_);\n+\t}\n+\n \t/*\n \t * 0 = Red, 1 = Green, 2 = Blue\n \t */\n@@ -509,7 +533,7 @@ int DebayerEGL::debayerGPU(MappedFrameBuffer &in, int out_fd, const DebayerParam\n \tegl_.makeCurrent();\n \n \t/* Create a standard texture input */\n-\tegl_.createTexture2D(*eglImageBayerIn_, glFormat_,\n+\tegl_.createTexture2D(*eglImageBayerIn_, glFormat_, glFormat_, GL_UNSIGNED_BYTE,\n \t\t\t inputConfig_.stride / bytesPerPixel_, height_,\n \t\t\t in.planes()[0].data(), GL_NEAREST);\n \ndiff --git a/src/libcamera/software_isp/debayer_egl.h b/src/libcamera/software_isp/debayer_egl.h\nindex 3f5db355a..85f51cf88 100644\n--- a/src/libcamera/software_isp/debayer_egl.h\n+++ b/src/libcamera/software_isp/debayer_egl.h\n@@ -77,7 +77,10 @@ private:\n \tstd::unique_ptr eglImageBayerIn_;\n \tstd::unique_ptr eglImageBayerOut_;\n \n+\t/* LSC lookup table */\n+\tstd::unique_ptr eglImageLscLookup_;\n \tbool lscEnabled_;\n+\n \t/* Shader parameters */\n \tfloat firstRed_x_;\n \tfloat firstRed_y_;\n@@ -91,6 +94,8 @@ private:\n \n \tGLint textureUniformBayerDataIn_;\n \n+\tGLint textureUniformLsc_;\n+\n \t/* Represent per-frame CCM as a uniform vector of floats 3 x 3 */\n \tGLint ccmUniformDataIn_;\n \n","prefixes":["RFC","v5","07/10"]}