{"id":26769,"url":"https://patchwork.libcamera.org/api/patches/26769/?format=json","web_url":"https://patchwork.libcamera.org/patch/26769/","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":"<20260518201508.140849-2-robert.mader@collabora.com>","date":"2026-05-18T20:15:05","name":"[v2,1/4] egl: Set more eGLImage paramters in constructor","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"7812eb9c3e21043f6758027494021cb3d846f63a","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/26769/mbox/","series":[{"id":5953,"url":"https://patchwork.libcamera.org/api/series/5953/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5953","date":"2026-05-18T20:15:04","name":"software_isp: Implement DMABuf import for input buffers","version":2,"mbox":"https://patchwork.libcamera.org/series/5953/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/26769/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/26769/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 AC3ADBDCBD\n\tfor ;\n\tMon, 18 May 2026 20:16:19 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 63E3563026;\n\tMon, 18 May 2026 22:16:19 +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 3518162FE1\n\tfor ;\n\tMon, 18 May 2026 22:16:17 +0200 (CEST)","by mx.zohomail.com with SMTPS id 1779135370420773.2495325728922;\n\tMon, 18 May 2026 13:16:10 -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=\"iUKxw+E4\"; \n\tdkim-atps=neutral","ARC-Seal":"i=1; a=rsa-sha256; t=1779135372; cv=none; \n\td=zohomail.com; s=zohoarc; \n\tb=fRnNaFoHnb5FjIWue8PrJQB83z/vza4Fli0Ztzs+xZ8lEo2vKsCX5XKySyXC5b1oZAUjAI4x6n4eDU0jFZYZp3b2MQ2kpGV9ngYSC/H7snLS8vowdejcE3g76dBSXzulibFgLr6m47AzWt2Y8qGvRMkUFcMwXgmPj6KAVSNXmBs=","ARC-Message-Signature":"i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; \n\ts=zohoarc; t=1779135372;\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=RctL3Zn3g/C7zA8lhPhIkstnVNimymWPBcHt6xePCKY=; \n\tb=dQfXpwBbTp+fIXoD1x1YGqTkWKZ6gB4sEWSxJL/E1abK7j703ggJW8d8iidblEnmAikZxRuLdgmKInWIKe7Vt9fJrX+GVvFWj/N9mPb1aUBaT3rTO6eI8lZ21w5RaP3hu3OHgYCOdw2Cmi78vN6t7SOIbXP33ijFLg2VUu4QjdM=","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=","DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1779135372;\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=RctL3Zn3g/C7zA8lhPhIkstnVNimymWPBcHt6xePCKY=;\n\tb=iUKxw+E4SDKkD4aQLjVVgvn9qTvKT/XSPyZCC1/FnYMKxsmtHGVE5N7fHgm45Q88\n\tJjSt0Y84Cz1RWYP9M07Yrag6vmJcqEqu8j2CdzU+jK8gAdtWO0eBWkm3RvPWqZkNNUo\n\thEfesU9RjvWQZ92gC10l2w1pcT7LEmmUf64Za/Vw=","From":"Robert Mader ","To":"libcamera-devel@lists.libcamera.org","Cc":"Robert Mader ","Subject":"[PATCH v2 1/4] egl: Set more eGLImage paramters in constructor","Date":"Mon, 18 May 2026 22:15:05 +0200","Message-ID":"<20260518201508.140849-2-robert.mader@collabora.com>","X-Mailer":"git-send-email 2.54.0","In-Reply-To":"<20260518201508.140849-1-robert.mader@collabora.com>","References":"<20260518201508.140849-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":"","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":"The parameters - format, width, height and stride - never change. Set them\nduring construction and remove them from createTexture2D(), making the\nlater match createInputDMABufTexture2D() and createOutputDMABufTexture2D().\n\nSigned-off-by: Robert Mader \n---\n include/libcamera/internal/egl.h | 7 +++---\n src/libcamera/egl.cpp | 29 +++++++++++++++++-----\n src/libcamera/software_isp/debayer_egl.cpp | 12 ++++-----\n 3 files changed, 33 insertions(+), 15 deletions(-)","diff":"diff --git a/include/libcamera/internal/egl.h b/include/libcamera/internal/egl.h\nindex 0ad2320b1..8d80d6fb5 100644\n--- a/include/libcamera/internal/egl.h\n+++ b/include/libcamera/internal/egl.h\n@@ -57,8 +57,8 @@ public:\n \t * \\param[in] texture_unit OpenGL texture unit\n \t * \\param[in] texture_unit_uniform_id Shader uniform ID\n \t */\n-\teGLImage(uint32_t width, uint32_t height, uint32_t stride, GLenum texture_unit, uint32_t texture_unit_uniform_id)\n-\t\t: width_(width), height_(height), stride_(stride),\n+\teGLImage(GLint format, uint32_t width, uint32_t height, uint32_t stride, GLenum texture_unit, uint32_t texture_unit_uniform_id)\n+\t\t: format_(format), width_(width), height_(height), stride_(stride),\n \t\t framesize_(stride * height),\n \t\t texture_unit_uniform_id_(texture_unit_uniform_id),\n \t\t texture_unit_(texture_unit)\n@@ -79,6 +79,7 @@ public:\n \t\tglDeleteTextures(1, &texture_);\n \t}\n \n+\tGLint format_;\n \tuint32_t width_; /**< Image width in pixels */\n \tuint32_t height_; /**< Image height in pixels */\n \tuint32_t stride_; /**< Row stride in bytes */\n@@ -103,7 +104,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 &shaderEnv, const char *str);\n \tvoid makeCurrent();\ndiff --git a/src/libcamera/egl.cpp b/src/libcamera/egl.cpp\nindex 357918711..b8f5d9b85 100644\n--- a/src/libcamera/egl.cpp\n+++ b/src/libcamera/egl.cpp\n@@ -14,6 +14,8 @@\n #include \n #include \n \n+#include \n+\n #include \n #include \n #include \n@@ -111,13 +113,31 @@ void eGL::syncOutput()\n */\n int eGL::createDMABufTexture2D(eGLImage &eglImage, int fd, bool output)\n {\n+\tEGLint drm_format;\n+\n \tASSERT(tid_ == Thread::currentId());\n \n+\tswitch (eglImage.format_) {\n+\tcase GL_RED:\n+\tcase GL_LUMINANCE:\n+\t\tdrm_format = DRM_FORMAT_R8;\n+\t\tbreak;\n+\tcase GL_RG:\n+\t\tdrm_format = DRM_FORMAT_RG88;\n+\t\tbreak;\n+\tcase GL_RGBA:\n+\t\tdrm_format = DRM_FORMAT_ARGB8888;\n+\t\tbreak;\n+\tdefault:\n+\t\tLOG(eGL, Error) << \"unhandled GL format\";\n+\t\treturn -ENODEV;\n+\t}\n+\n \t// clang-format off\n \tEGLint image_attrs[] = {\n \t\tEGL_WIDTH, (EGLint)eglImage.width_,\n \t\tEGL_HEIGHT, (EGLint)eglImage.height_,\n-\t\tEGL_LINUX_DRM_FOURCC_EXT, DRM_FORMAT_ARGB8888,\n+\t\tEGL_LINUX_DRM_FOURCC_EXT, drm_format,\n \t\tEGL_DMA_BUF_PLANE0_FD_EXT, fd,\n \t\tEGL_DMA_BUF_PLANE0_OFFSET_EXT, 0,\n \t\tEGL_DMA_BUF_PLANE0_PITCH_EXT, (EGLint)eglImage.stride_,\n@@ -207,9 +227,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@@ -217,7 +234,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@@ -225,7 +242,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 eae4c57f4..a217e3798 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@@ -582,14 +582,14 @@ int DebayerEGL::start()\n \n \tLOG(Debayer, Debug) << \"Available fragment shader texture units \" << maxTextureImageUnits;\n \n+\tif (initBayerShaders(inputPixelFormat_, outputPixelFormat_))\n+\t\treturn -EINVAL;\n+\n \t/* Raw bayer input as texture */\n-\teglImageBayerIn_ = std::make_unique(width_, height_, inputConfig_.stride, GL_TEXTURE0, 0);\n+\teglImageBayerIn_ = std::make_unique(glFormat_, inputConfig_.stride / bytesPerPixel_, height_, inputConfig_.stride, GL_TEXTURE0, 0);\n \n \t/* Texture we will render to */\n-\teglImageBayerOut_ = std::make_unique(outputSize_.width, outputSize_.height, outputConfig_.stride, GL_TEXTURE1, 1);\n-\n-\tif (initBayerShaders(inputPixelFormat_, outputPixelFormat_))\n-\t\treturn -EINVAL;\n+\teglImageBayerOut_ = std::make_unique(GL_RGBA, outputSize_.width, outputSize_.height, outputConfig_.stride, GL_TEXTURE1, 1);\n \n \treturn 0;\n }\n","prefixes":["v2","1/4"]}