From patchwork Mon Jul 6 11:38:55 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: 27247 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 95A83C330A for ; Mon, 6 Jul 2026 11:39:17 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4EDAA66023; Mon, 6 Jul 2026 13:39:17 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="xGD4BWn7"; dkim-atps=neutral Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 60F4066030 for ; Mon, 6 Jul 2026 13:39:13 +0200 (CEST) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-47c2b362ee2so1523466f8f.1 for ; Mon, 06 Jul 2026 04:39:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1783337953; x=1783942753; 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=xGD4BWn7VEAW5mipZlXFi2fLOmqB5FZvNIv/5hvhZWx1OcP1SS5+0bkMoEhGkK7jEH lYYs0nSLhP+3GAVV7x/7XOChxE+YOHOLePhNsv9ME6C0bmy/6EvHUpGTKJmTVVhHhEQ6 zPeQ6BiYRGlgtHYXLGM/C64UAapU49aW6DNiEAUh79Vw1L45r58J5RyDbU1w36Owj8dC v6tPG+9CJ17saLEZkK/ESrWc98a8FXHLQp8kSmNyB5D5JmsIkaYmpJR469fiXeQXBeTD MvYHTK5N1z9VQJVaY1uKGeHeDFkGqcynOEgSHsv63G2rJrS204WoJY224o7z75Z0M2zz +FTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783337953; x=1783942753; 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=CRk4OHs/Btlrh7wuIz4QFTokhFeqcXY/dYJ44HfHhPr50QyGFsVkJ7vfAbMMc0QlKZ V5gwu+o3K5SJOEy3wuPQSvuY2vPeDA/+KXn7Cqs80upbtllt+JcQWgjzF1RzV0Zu5fNd CSqMEVko/i3R4kbXuBTwdTLfPfPs2DnhiLK5QwSDRBIdeI25YmNtk/pfH30ZtqVcnKLU b32VMK+c0sB5bsu+X0O1fioitjHC5+Kmo9uS6TjIdWnsuo0+hpC+zE2lIN0Zz7jxWa2i RjIjdw0ylcTukNLy7xNyO3m2co7BUbOlNxduLTZeFNadO6rvTTQTQM8xlynP7ALGak/K kfew== X-Gm-Message-State: AOJu0YwAVCZAjYUtgAxVADsGECU46oxtdgDIqzxdi6c4svlofy84LWCQ mTDCQja3DXuvJwfrTufLoInwZQHvLO0NRXGV/BRyVEjDTvdP8Y92pRRhpNX2iO8AXVui8wXTA2T ujB83 X-Gm-Gg: AfdE7cmt5piq/4IbdVg6sg+kz7U/a9fBUQT3R5aVdzq1YkWcr15bdOSA+KcK0AyZQDg Idw77C3mVRAwa6u56Jn70tUyM51Ic/2k/OSRzsXFWXTkE3sxPH6S5k8zHIeFQxBmx0yi1KeL6By 9Ef3uojm5ZUc/ePzVLHqPyUgDmLftKX9NL/1lMMHPzmGWo7zNwz9gI/cvo5R4D2+Pf0tfc7+WQ3 bflOghgVzhh4PLQOd+YS1t3jM31uyaOyD7fhqtSs4aFIBILd8MZpbvA31H7L0IrqudVdH7jxgu+ C756Sjil8ldwhzYtPn286Ca4USIcqvZhCqWOyM6hwq8NI4CQog6vF74kUFq0l6e/E//MNogNN1D k9lYMuscZ8RkEBUzZcU1sLmzgWL3A3At17N5oOMGs23P0Xy68Ofur+jd/KZ2ljUrsrnLVirRxA9 8xvVpUNjNCseBPYQpHH/RHUG3xBFZo X-Received: by 2002:a05:6000:184d:b0:47d:ca2:6234 with SMTP id ffacd0b85a97d-47d0ca26431mr7636412f8f.19.1783337952677; Mon, 06 Jul 2026 04:39:12 -0700 (PDT) Received: from inspiron14p-linux ([109.77.44.220]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47a9de1e6ccsm24796084f8f.5.2026.07.06.04.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 04:39:12 -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 v5 2/7] libcamera: egl: Add new helper attachTextureToFBO Date: Mon, 6 Jul 2026 12:38:55 +0100 Message-ID: <20260706113900.2530549-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260706113900.2530549-1-bryan.odonoghue@linaro.org> References: <20260706113900.2530549-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; } /**