From patchwork Fri Jun 26 11:33:20 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: 27050 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 18F06C3303 for ; Fri, 26 Jun 2026 11:33:45 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6A29565902; Fri, 26 Jun 2026 13:33:44 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="b12rW2fW"; dkim-atps=neutral Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 209EE658F7 for ; Fri, 26 Jun 2026 13:33:41 +0200 (CEST) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-490cf3000f0so8767895e9.1 for ; Fri, 26 Jun 2026 04:33:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1782473621; x=1783078421; 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=LrHNd8eVo+wksS/oQ0Oh5AIQ6rb4Iv4ObWfNNR4zJvg=; b=b12rW2fWaA163AKi+VM9PwV8abAnfwTZjpGGs0gdQVeivtAKMUmF1BhUzMW8bPdu9X 075JFvYG/KJQHy1GMU6ou4JCqew/eABOBreXZI6s5hTIAOCAlORpVdZyUOmu7qAOny+I eK+0UM1Ni9o26iWINsdhDusc516dg4FVIbSrLU8aWW+itmIjFFS8t2XdBKNo4T3+xF6w P1Tmwc3i+ZaBXKbl0Ro7eF5R/lsJmDxEo3NeqAtBROjAAwO085mMr8ifdhfub0/Laek4 tSfDor8aV8wE5Ypp+ScR+8QTe6YITAxmAfHjbDPtm9LPkBG57ptJQdAcV6ARnmEj8lla ZBcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782473621; x=1783078421; 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=LrHNd8eVo+wksS/oQ0Oh5AIQ6rb4Iv4ObWfNNR4zJvg=; b=kArrbHOMs4cKM4VnDJj3cJArM992M/QNdLT4/A8RG1C+tyKRps8AN4zgVt6FFGUlt5 ivlWdh9YZM+dwDQN3A4mgqbZXrSFQ6tkwub5xZ5XHfkkD4mukWYt2NBeuVA2SUf1FN5N XLqAeukgofby9F6FBcVBtz/KVoSvS9VXguJ1ImpQMAgkNqiXP5/giOVyu6A+7Gg0CnNe DbXeVjq6j1Tw0t52MNUTg2iSELprJb+7uxiNZO4sUNmpQaDpDK82rlXmh/1L7fbC6Pol fR94xtCvdpiuWNc0yDkS/IVbmF0u0G9VHsAel4WrmxY4JDoU+AVLlt17fTEJ+CsV5Epe DAzQ== X-Gm-Message-State: AOJu0YyH0lqq8eEJbJPavk4J7TdBGP9s72FEB6Zs4n2ttZMcKXO/33CM m2EdJkVhg+q31hILDOr+tVDfQ15j0Jjrg0TquudTsf+d8bPCSG1ynh5eKQJ3oS+1IJtF4dCBu1b A4IlA81A= X-Gm-Gg: AfdE7ckAaVc7RLPV6l6uYTq9+ka1Tw+FJYy5ABanF0MozEETlnsSNVLwX0coOUZ9exu OpPMYpPP1NtyjV/H3WD6Btce9YMgbGp/sps1xxr/+GAnSI7ia9ornW8i3FPhxzRttFoKjbHUkps FeGXv+Lqz1fjlxsrhayNJlr310xt/3f6nGD9Cr86+C/2qEYtuk+mbJQWpxfO5xC5vJwH7JpKNIM dBRgZaE62LtY97nHhRY9F0JcQ1jeFEkVxD2c7LsNx24cmikUBNfCWZacArayguUlpzCbunmIcw1 t6P7bW0tv5O1YZ30m2UvC1GDCNm6VhYiK+RC2do9RZgyvPwv9oVFX9MtYMi6l8NJHVmB7SEPJhu ysmhCg/pzAVTg0X3gFaQ1YMSu62PbA2nacldhY56PVat7HKYtvy/OqpGzWueYVfke9mmZLjizh4 9zCy/ZwreA23c60vhfn6YYlRi2gw== X-Received: by 2002:a05:600c:3552:b0:492:700b:deea with SMTP id 5b1f17b1804b1-492700bdef5mr3810595e9.13.1782473620548; Fri, 26 Jun 2026 04:33:40 -0700 (PDT) Received: from inspiron14p-linux ([109.76.78.98]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49268fe31b0sm79265985e9.4.2026.06.26.04.33.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2026 04:33:39 -0700 (PDT) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: bryan.odonoghue@linaro.org, pavel@ucw.cz, Robert Mader Subject: [PATCH v3 3/8] libcamera: egl: Add new helper attachTextureToFBO Date: Fri, 26 Jun 2026 12:33:20 +0100 Message-ID: <20260626113325.3218045-4-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260626113325.3218045-1-bryan.odonoghue@linaro.org> References: <20260626113325.3218045-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 Signed-off-by: Bryan O'Donoghue Reviewed-by: Milan Zamazal --- 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; } /**