From patchwork Mon Jul 6 11:01:15 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 27239 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C7A5DC330A for ; Mon, 6 Jul 2026 11:01:35 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 58ECE6601E; Mon, 6 Jul 2026 13:01:35 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="mvBO5g1f"; dkim-atps=neutral Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C097966007 for ; Mon, 6 Jul 2026 13:01:32 +0200 (CEST) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-493c19bad03so26453695e9.2 for ; Mon, 06 Jul 2026 04:01:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1783335692; x=1783940492; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sCherSufb0on4kaTY2CKoIjTcZ+GTv1qK3dt1yZ0ysg=; b=mvBO5g1f7tJ6PKUdt0ZhBXCcr5meLfrqRN2iqRk8gqJQSDA3RwCAfX+snkqxf6IBOJ XO4T2LCADaHtiFWdoYhsxCKS9TAi59lY9zqnHVRDbNPsmHh0teM6U1CEPPIzk/mz8MFp gYbw1GxrocrQQFFmzZUZ8870kPQZqju6uRUOM3pNg5epVv5s809BLdFbrQdwiM8/gzEs j0f2ZEbdkcX5W9zRJaPb8gwXTXHQUx8o0XjVCWVQrw6R5jMAvz3lmHyNqaSFBnDA16lT G0mLLsT6It8ow0ImqB3RNTa3ISuyUhcwhMNE4aPmCY8DFo/fl5KAaavdxkfJWXqCYfU0 L9Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783335692; x=1783940492; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=sCherSufb0on4kaTY2CKoIjTcZ+GTv1qK3dt1yZ0ysg=; b=CAGj335mBVe5GXv2i43r6fV8gHLCo/VSBbokNAmWq4bGfN8pMcdfNCWDvzV4ZykLuG grrF4Xz6YuU2UWW9MoQuhJ3LA0LyhnAWWdiMhwKQ3pb+jYebrKOMDpxLNhRjs4a9mom8 3rfA5ae6C/W234FsTz7lYbhX6eDC7A6IMp5akd6Wij85uwIET0mHYdOIA2aQ6gvzKOKX abl5w18vAe1fShqZGvujqn30WnQ1Lv7B3ybfMFEiEuxB8035X68W96RI3CR7GfHBFNmd 7Tbnl7SHXEsWScedUFAMOsdvJ42jqanSidIeuzY6gMCV/gryUAwK9ER/vyNxytU9d1gi S9Xw== X-Gm-Message-State: AOJu0YztEoRpOhrWmMSyL5i4wjzUm6MZFjsMHDmZyq4uus/TrOlVtCex 74RzzRIGlD98RhJOpvLxrbZyMzGSK2/66K/yJp81lxUVTd972QYhMbjwvD7GuZnn88nNsAZTVWZ W6I2B X-Gm-Gg: AfdE7cldx9ygtZk9kObPte0d4jSgjzywFvlKT2g2/9cFsLjcCIevQiH18bTkFTJHWDT Nw3OBBeZwCq3sWCB6aWE1jSFrNV6RSdtJWr9kH7q4EHmtnmmN+NoleY0eZxl6QIZ6KsQM2C569R E4wE9feLRE5BJ7lfFxXLKhrLdakPLfMZb/fFEC6t0eSH+sJa3IVZZTiHSolFH00yp91Gm4w6oGm YJatwGm2sJHfv4vPuUUl8eam1RoLeEdDecSxvvOb/g9alYM3WafZoIgPPC30QJAbr5kfYCC919/ imCXTcF93HMaR6lAZMpVJ7pJoKLwyXeTWY7BKZ7QHB+uoHVzHKJ+euW50iscaDivBlMf3uenmWJ zbs5fIMIAqcn5tp37gn/laXZZ6yB11vNDApluqUwpQWjcn2OeGypoGOEjhOp2lkjUvNQk8OdeNY Ilv6oKWT5bsKzm2RZOlyArhkWjl/4/ X-Received: by 2002:a05:600c:34cb:b0:493:b150:c607 with SMTP id 5b1f17b1804b1-493d11d936amr110500875e9.12.1783335692234; Mon, 06 Jul 2026 04:01:32 -0700 (PDT) Received: from inspiron14p-linux ([109.77.44.220]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47aa0960634sm25190846f8f.26.2026.07.06.04.01.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 04:01:31 -0700 (PDT) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: bryan.odonoghue@linaro.org, pavel@ucw.cz, Robert Mader , Milan Zamazal Subject: [PATCH v4 2/7] libcamera: egl: Add new helper attachTextureToFBO Date: Mon, 6 Jul 2026 12:01:15 +0100 Message-ID: <20260706110120.2509826-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260706110120.2509826-1-bryan.odonoghue@linaro.org> References: <20260706110120.2509826-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This method does what it says on the tin. It attaches a texture to a framebuffer object, splitting existing code into a helper function which we will use in subsequent patches. Reviewed-by: Robert Mader Reviewed-by: Milan Zamazal Signed-off-by: Bryan O'Donoghue --- include/libcamera/internal/egl.h | 2 ++ src/libcamera/egl.cpp | 42 +++++++++++++++++++++++--------- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/include/libcamera/internal/egl.h b/include/libcamera/internal/egl.h index 523a62aa8..085a371f3 100644 --- a/include/libcamera/internal/egl.h +++ b/include/libcamera/internal/egl.h @@ -109,6 +109,8 @@ public: int createOutputDMABufTexture2D(eGLImage &eglImage, int fd); void createTexture2D(eGLImage &eglImage, void *data); + int attachTextureToFBO(eGLImage &eglImage); + void pushEnv(std::vector &shaderEnv, const char *str); void makeCurrent(); diff --git a/src/libcamera/egl.cpp b/src/libcamera/egl.cpp index b5a5dc60b..ed67aca7b 100644 --- a/src/libcamera/egl.cpp +++ b/src/libcamera/egl.cpp @@ -112,6 +112,32 @@ void eGL::flushOutput() glFlush(); } +/** + * \brief Attach a texture to a frame-buffer-object + * + * \param[in,out] eglImage EGL image containing texture to attach to FBO + * + * Helper function to make attachment of texture to FBO easy to reuse. + * + * \return 0 on success, or -ENODEV on failure + */ +int eGL::attachTextureToFBO(eGLImage &eglImage) +{ + int ret = 0; + + // Generate a framebuffer from our texture direct to dma-buf handle buffer + glBindFramebuffer(GL_FRAMEBUFFER, eglImage.fbo_); + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, eglImage.texture_, 0); + + GLenum err = glCheckFramebufferStatus(GL_FRAMEBUFFER); + if (err != GL_FRAMEBUFFER_COMPLETE) { + LOG(eGL, Error) << "glFrameBufferTexture2D error " << err; + ret = -ENODEV; + } + + return ret; +} + /** * \brief Create a DMA-BUF backed 2D texture * \param[in,out] eglImage EGL image to associate with the DMA-BUF @@ -127,6 +153,7 @@ void eGL::flushOutput() int eGL::createDMABufTexture2D(eGLImage &eglImage, int fd, bool output) { EGLint drm_format; + int ret = 0; ASSERT(tid_ == Thread::currentId()); @@ -186,19 +213,10 @@ int eGL::createDMABufTexture2D(eGLImage &eglImage, int fd, bool output) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - if (output) { - // Generate a framebuffer from our texture direct to dma-buf handle buffer - glBindFramebuffer(GL_FRAMEBUFFER, eglImage.fbo_); - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, eglImage.texture_, 0); + if (output) + ret = attachTextureToFBO(eglImage); - GLenum err = glCheckFramebufferStatus(GL_FRAMEBUFFER); - if (err != GL_FRAMEBUFFER_COMPLETE) { - LOG(eGL, Error) << "glFrameBufferTexture2D error " << err; - return -ENODEV; - } - } - - return 0; + return ret; } /**