[{"id":38951,"web_url":"https://patchwork.libcamera.org/comment/38951/","msgid":"","date":"2026-05-26T17:27:36","subject":"Re: [PATCH v4 1/5] egl: Add GL format parameter to eGLImage\n\tconstructor","submitter":{"id":226,"url":"https://patchwork.libcamera.org/api/people/226/","name":"Bryan O'Donoghue","email":"bod.linux@nxsw.ie"},"content":"On 21/05/2026 16:59, Robert Mader wrote:\n> In preparation for the following commits. This requires a minor\n> reordering in DebayerEGL::start() as the value for the input texture is\n> only known after initBayerShaders().\n> \n> Signed-off-by: Robert Mader \n> ---\n> include/libcamera/internal/egl.h | 6 ++++--\n> src/libcamera/egl.cpp | 22 +++++++++++++++++++++-\n> src/libcamera/software_isp/debayer_egl.cpp | 10 +++++-----\n> 3 files changed, 30 insertions(+), 8 deletions(-)\n> \n> diff --git a/include/libcamera/internal/egl.h b/include/libcamera/internal/egl.h\n> index 0ec8ea6ec..825240dbb 100644\n> --- a/include/libcamera/internal/egl.h\n> +++ b/include/libcamera/internal/egl.h\n> @@ -51,14 +51,15 @@ class eGLImage\n> public:\n> \t/**\n> \t * \\brief Construct an eGLImage with explicit stride\n> +\t * \\param[in] format Image GL format\n> \t * \\param[in] width Image width in pixels\n> \t * \\param[in] height Image height in pixels\n> \t * \\param[in] stride Row stride in bytes\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 +80,7 @@ public:\n> \t\tglDeleteTextures(1, &texture_);\n> \t}\n> \n> +\tGLint format_; /**< Image GL 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> diff --git a/src/libcamera/egl.cpp b/src/libcamera/egl.cpp\n> index 19ae92305..2aabfc2e0 100644\n> --- a/src/libcamera/egl.cpp\n> +++ b/src/libcamera/egl.cpp\n> @@ -20,6 +20,8 @@\n> \n> #include \n> \n> +#include \n> +\n> namespace libcamera {\n> \n> LOG_DEFINE_CATEGORY(eGL)\n> @@ -124,13 +126,31 @@ void eGL::flushOutput()\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> diff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp\n> index 7b9e02d90..8c1f2074d 100644\n> --- a/src/libcamera/software_isp/debayer_egl.cpp\n> +++ b/src/libcamera/software_isp/debayer_egl.cpp\n> @@ -583,14 +583,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_, width_, 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> --\n> 2.54.0\n> \n\nThis looks good\n\n\nReviewed-by: Bryan O'Donoghue \n\n---\nbod","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 63835BDCBC\n\tfor ;\n\tTue, 26 May 2026 17:27:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3FF0A63025;\n\tTue, 26 May 2026 19:27:42 +0200 (CEST)","from mail-244119.protonmail.ch (mail-244119.protonmail.ch\n\t[109.224.244.119])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4822062FB1\n\tfor ;\n\tTue, 26 May 2026 19:27:41 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=nxsw.ie header.i=@nxsw.ie header.b=\"clMABfCp\";\n\tdkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxsw.ie;\n\ts=protonmail; t=1779816460; x=1780075660;\n\tbh=td24LKgEvXi8uaP3C/TEhHhZXVCAUuG6GiFiXFB4NfU=;\n\th=Date:To:From:Subject:Message-ID:In-Reply-To:References:\n\tFeedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID:\n\tMessage-ID:BIMI-Selector;\n\tb=clMABfCpnfkvC20QTrt4P1VWW+IPB017iFWgdT/Ls2wt5Jh03TubHIclC1mMZ3ZZN\n\tqXN8WL672aSZGfuLZURydiQBm6St69tKf9FT2spiBke2I7CsJJ93JmWoB99eMPBZEf\n\tDnbofX6o1PpWhVCTIlQoocznhs2X8cL9hfPzWoOQVWzSWyDnFLd8iPQXc48Vn6qlFJ\n\teqbXSowNYBKTnOZ5UPx0K2kpQTF3WwnBw7rz+HkdkGJY193wvwKdt/UcG0ha2r1ypw\n\tnzP9W/EKcSbR1N0eB82QsgfkSP3bxcLr4Sq/l33iDsh+HyjN0wqhed8k6vpIF/Kvou\n\ta9k+6TX8szP3Q==","Date":"Tue, 26 May 2026 17:27:36 +0000","To":"Robert Mader ,\n\tlibcamera-devel@lists.libcamera.org","From":"Bryan O'Donoghue ","Subject":"Re: [PATCH v4 1/5] egl: Add GL format parameter to eGLImage\n\tconstructor","Message-ID":"","In-Reply-To":"<20260521155906.120373-2-robert.mader@collabora.com>","References":"<20260521155906.120373-1-robert.mader@collabora.com>\n\t<20260521155906.120373-2-robert.mader@collabora.com>","Feedback-ID":"136405006:user:proton","X-Pm-Message-ID":"b33c16a015bde2e901a2db6cd412ca1ce15f31fe","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Transfer-Encoding":"quoted-printable","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\" "}}]