From patchwork Wed Jun 24 08:58:41 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: 27028 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 0A9DFC3306 for ; Wed, 24 Jun 2026 08:59:10 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 74A7465890; Wed, 24 Jun 2026 10:59:07 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="z2Vy+Mm9"; dkim-atps=neutral Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0856265881 for ; Wed, 24 Jun 2026 10:59:02 +0200 (CEST) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-490ace40f4bso7839925e9.3 for ; Wed, 24 Jun 2026 01:59:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1782291541; x=1782896341; 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=DGSX4mJkH/NgV4HkrvHTAen8yB9jSEbQDaqlO5PH55E=; b=z2Vy+Mm9PhuTr3ApY5O29hlXis/BXAx36Ph4zocNYSzxWk4GwHHjAk2H2Bej5jLsIk zE35UYTovo7Fh5WDZuCKJ5jmWiL1UXXf88xn9PlQcOzVdnqY+b0DxP2AR2FW0oIuh0Yk JlLPwHISTj55xkx7sIGJ4W5qeoi8NFFQuh9/J+xNCslJd71FF4DgQglsn06ymRe6FrwE v6O+Q057BRQUms4So1GKzPQiaalxLxYxxMvuauqWDR80X189A0uBxqquQKqGMAKp4yeF RCEfURXTEktle//v08++EAfK3NOH1nDvmOchBh3QEbuZJH7jBDYSzNOSHCKV4vZRo/0g /vug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782291541; x=1782896341; 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=DGSX4mJkH/NgV4HkrvHTAen8yB9jSEbQDaqlO5PH55E=; b=FOayKRD8ro3nCvFSIDdsnnFYQnWdTzTbNAmri8lY/cdtKRXSNIzmb224WkXBi9JQmS VIDqpk8TcVQ2qA/svr858MXmloJQ5Y6pHDz0QXcS+QQxoqHJunwR9kescy7QQYzNub8F VngkvFg5pho2hjvj5Bv/52OZS1ZcmfEhMvyneqmMeZofsfJAjQrGL3DfQewpsSWH/RLh Apa9j2H0DNlv5rhYPRmu7T0ahxD1dCG8zlUpUtJOzCyBqgiRbvYrkumY2n9F3Wwar6At DTEVjYRN+BwNcQvdrbRA+FmHhQfdQmqTxOCR3cqV1GdUAC55tqyxHqFPNLQ5qI/9lA4u e8DQ== X-Gm-Message-State: AOJu0YyyZByKwlZ1N4YbW/GxIkkjq0eGALbcEI5MEYM2SYEVWidNwwTM X2AG1akH5569X4xcwP8VV04Ck+D8mGiJFg4sYLsoR0fMmQ22j/QOk8Qfrm/EQYEXPvQvpr28clD z02uRZuo= X-Gm-Gg: AfdE7clvfcaPq55Cmjj/RgNxdbE11cYixmjo4Gu5cSdgypIs1XWbgvIu9iaXIe2c0k0 IhHB752RU5/JumA4Vpng8MTDBkohVrS1WegiM2GWii/qEp/NgYmo9aBIiSoPWDQt5RwgBqxQwZV d5iXmB4FHxaGJiS3bNTdHVETyULO7XnBXH5GXeT9UeJl+GAl/U6Ob2E1NdZGOGv5GqLJdzwVFmE u0TYr0Vd8aZOvIXkvPcUqtAlAcfhKIqX9arkaS722jtyNd7ns2n75h/GRAgkmjXT9hWSeXslK31 CHljVdU20SMqAdS+9KUlTqFday790CcCD/iPHt66D9/FI5oAszZAGxajSkFptnR4KgkFXWWn9Cs ONipXpXFj0xnAqdJTHeO1VEhE2j1FhP4Y18GmtbYmtrzdccOhAnkYejyUbbB0tUt0/iEyNIqVqy oy7Q37A1lSNGTwcDzZlnsf0EFNauhiMBN5Cq9sciM= X-Received: by 2002:a05:600c:4ecb:b0:492:37b7:607a with SMTP id 5b1f17b1804b1-492608796bemr33705045e9.31.1782291541557; Wed, 24 Jun 2026 01:59:01 -0700 (PDT) Received: from inspiron14p-linux ([109.76.100.231]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49261063d6esm25128375e9.2.2026.06.24.01.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2026 01:59:01 -0700 (PDT) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: bryan.odonoghue@linaro.org, pavel@ucw.cz Subject: [PATCH 02/10] libcamera: egl: Add new helper attachTextureToFBO Date: Wed, 24 Jun 2026 09:58:41 +0100 Message-ID: <20260624085849.873784-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260624085849.873784-1-bryan.odonoghue@linaro.org> References: <20260624085849.873784-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. Signed-off-by: Bryan O'Donoghue Reviewed-by: Robert Mader --- 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 f7bfb28d4..4b0757afd 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 f03abb8ae..e83e24606 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; } /**