{"id":26807,"url":"https://patchwork.libcamera.org/api/patches/26807/?format=json","web_url":"https://patchwork.libcamera.org/patch/26807/","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":"<20260527081534.20245-3-robert.mader@collabora.com>","date":"2026-05-27T08:15:31","name":"[v5,2/5] egl: Remove some parameters from createTexture2D()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"6517920868e821a865fee2ed6f6aeeb627366745","submitter":{"id":140,"url":"https://patchwork.libcamera.org/api/people/140/?format=json","name":"Robert Mader","email":"robert.mader@collabora.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/26807/mbox/","series":[{"id":5965,"url":"https://patchwork.libcamera.org/api/series/5965/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5965","date":"2026-05-27T08:15:29","name":"software_isp: Implement DMABuf import for input buffers","version":5,"mbox":"https://patchwork.libcamera.org/series/5965/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/26807/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/26807/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 E01D8C328C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 27 May 2026 08:16:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 570AF6302D;\n\tWed, 27 May 2026 10:16:18 +0200 (CEST)","from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com\n\t[136.143.188.112])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3C00C63020\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 27 May 2026 10:16:13 +0200 (CEST)","by mx.zohomail.com with SMTPS id 1779869763224499.1927884765007;\n\tWed, 27 May 2026 01:16:03 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=collabora.com\n\theader.i=robert.mader@collabora.com header.b=\"jXeWtG6t\"; \n\tdkim-atps=neutral","ARC-Seal":"i=1; a=rsa-sha256; t=1779869764; cv=none; \n\td=zohomail.com; s=zohoarc; \n\tb=HYXsPn5kJAEcQi8ae+PARReoGhFSqsg9m0kx1ZQ8Ha4DjkkXeOPNASyFE0GcWtQzbITgvqvV+dWRzs7OIWtL1J34nTFXm+Ci51FyqaVyAEWS9cMDxeAVSn2r2ajMYpy/YYXGeOdqbMDvg4B71rFZVHVZpW2EZTDEuhyLgXHTIlQ=","ARC-Message-Signature":"i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; \n\ts=zohoarc; t=1779869764;\n\th=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To;\n\tbh=l7RjJAijFsQIL0xNq9BIdDwiEkWp3YMq2V3d/E0NjOg=; \n\tb=R+2EyhiJ6pjX/K8134QcDfk0sNoxJKHVttczy7LTcFqcz5AQuWSgHTMeV9Cz90OTYysDrJuwf9AytGJhJI2BsnBwQ8uAzZUpnofO57txNqx5IatCfgoAyBkY91+OnQ7Sv26bumvjKuiapQhgChH4damr//OM216IbMHgPa+LALc=","ARC-Authentication-Results":"i=1; mx.zohomail.com;\n\tdkim=pass  header.i=collabora.com;\n\tspf=pass  smtp.mailfrom=robert.mader@collabora.com;\n\tdmarc=pass header.from=<robert.mader@collabora.com>","DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1779869764;\n\ts=zohomail; d=collabora.com; i=robert.mader@collabora.com;\n\th=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To;\n\tbh=l7RjJAijFsQIL0xNq9BIdDwiEkWp3YMq2V3d/E0NjOg=;\n\tb=jXeWtG6tSQy/aZLespliWmG3TacY3yeyOMv4Hgm24uvt8kFY/fe9h4OFTQr6Gu7R\n\t0eJArRdpggAGtIq0bethVYz16fRj0ApIcxg3k+iqDu/Swu0tEy+WSZbCDGQFtX1GJFB\n\tWixwBOytcGcDGio4n3fOiCJpqnThFyWAKeK9aoyk=","From":"Robert Mader <robert.mader@collabora.com>","To":"libcamera-devel@lists.libcamera.org","Cc":"Robert Mader <robert.mader@collabora.com>","Subject":"[PATCH v5 2/5] egl: Remove some parameters from createTexture2D()","Date":"Wed, 27 May 2026 10:15:31 +0200","Message-ID":"<20260527081534.20245-3-robert.mader@collabora.com>","X-Mailer":"git-send-email 2.54.0","In-Reply-To":"<20260527081534.20245-1-robert.mader@collabora.com>","References":"<20260527081534.20245-1-robert.mader@collabora.com>","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":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"And use the values set in the constructor instead, bringing the\nfunction in line with createInputDMABufTexture2D() and\ncreateOutputDMABufTexture2D().\n\nAdopt the value passed into the constructor accordingly, which\npreviously was never used.\n\nSigned-off-by: Robert Mader <robert.mader@collabora.com>\n---\n include/libcamera/internal/egl.h           | 2 +-\n src/libcamera/egl.cpp                      | 7 ++-----\n src/libcamera/software_isp/debayer_egl.cpp | 4 ++--\n 3 files changed, 5 insertions(+), 8 deletions(-)","diff":"diff --git a/include/libcamera/internal/egl.h b/include/libcamera/internal/egl.h\nindex 825240dbb..bcf09b475 100644\n--- a/include/libcamera/internal/egl.h\n+++ b/include/libcamera/internal/egl.h\n@@ -105,7 +105,7 @@ 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, void *data);\n+\tvoid createTexture2D(eGLImage &eglImage, void *data);\n \n \tvoid pushEnv(std::vector<std::string> &shaderEnv, const char *str);\n \tvoid makeCurrent();\ndiff --git a/src/libcamera/egl.cpp b/src/libcamera/egl.cpp\nindex 2aabfc2e0..267d22c8b 100644\n--- a/src/libcamera/egl.cpp\n+++ b/src/libcamera/egl.cpp\n@@ -240,9 +240,6 @@ 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] 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  *\n  * Creates a 2D texture from a CPU-accessible memory buffer. The texture\n@@ -250,7 +247,7 @@ 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, void *data)\n+void eGL::createTexture2D(eGLImage &eglImage, void *data)\n {\n \tASSERT(tid_ == Thread::currentId());\n \n@@ -258,7 +255,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, eglImage.format_, eglImage.width_, eglImage.height_, 0, eglImage.format_, GL_UNSIGNED_BYTE, data);\n \n \t// Nearest filtering\n \tglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);\ndiff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp\nindex 8c1f2074d..696498a58 100644\n--- a/src/libcamera/software_isp/debayer_egl.cpp\n+++ b/src/libcamera/software_isp/debayer_egl.cpp\n@@ -506,7 +506,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_, inputConfig_.stride / bytesPerPixel_, height_, in.planes()[0].data());\n+\tegl_.createTexture2D(*eglImageBayerIn_, in.planes()[0].data());\n \n \t/* Generate the output render framebuffer as render to texture */\n \tegl_.createOutputDMABufTexture2D(*eglImageBayerOut_, out_fd);\n@@ -587,7 +587,7 @@ int DebayerEGL::start()\n \t\treturn -EINVAL;\n \n \t/* Raw bayer input as texture */\n-\teglImageBayerIn_ = std::make_unique<eGLImage>(glFormat_, width_, height_, inputConfig_.stride, GL_TEXTURE0, 0);\n+\teglImageBayerIn_ = std::make_unique<eGLImage>(glFormat_, inputConfig_.stride / bytesPerPixel_, height_, inputConfig_.stride, GL_TEXTURE0, 0);\n \n \t/* Texture we will render to */\n \teglImageBayerOut_ = std::make_unique<eGLImage>(GL_RGBA, outputSize_.width, outputSize_.height, outputConfig_.stride, GL_TEXTURE1, 1);\n","prefixes":["v5","2/5"]}