From patchwork Mon Aug 10 10:59:42 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 27730 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 7A832C3264 for ; Mon, 10 Aug 2026 11:00:00 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3041A681F3; Mon, 10 Aug 2026 12:59:59 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Og0kFwYK"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CA2A7681C7 for ; Mon, 10 Aug 2026 12:59:47 +0200 (CEST) Received: from pb-laptop.local (185.221.141.208.nat.pool.zt.hu [185.221.141.208]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id CE29513D3 for ; Mon, 10 Aug 2026 12:58:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1786359513; bh=QBuKO1f/dviTboXk+ksOHrAGhNlUynY34fgZD3Rzmt8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Og0kFwYKjjbLFlPnVZavfWpZ7xBrGYr94uewies0trAROaAA3Pw96DpYTKjm8easH GsZX3fl7iuXS8TvPlHwinCBX8YJL2dT7QsrGpE8LGQBurWM3GHQ5YE4X6bUAGTZZWN og6uduHCDx8EJzVsQ363a27gfSV8Zo7kKZjnV1PM= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [RFC PATCH v2 8/8] libcamera: software_isp: debayer_egl: Remove EGL context switch Date: Mon, 10 Aug 2026 12:59:42 +0200 Message-ID: <20260810105942.1098192-9-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260810105942.1098192-1-barnabas.pocze@ideasonboard.com> References: <20260810105942.1098192-1-barnabas.pocze@ideasonboard.com> 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" `eGL::initEGLContext()`, which is called from the worker thread already includes a call to `eGL::makeCurrent()`, so calling it for each `process()` is not necessary, so skip it. Instead, add a function that asserts that the execution is in the correct thread, and call that. Signed-off-by: Barnabás Pőcze --- include/libcamera/internal/egl.h | 9 ++++++++- src/libcamera/egl.cpp | 8 ++++++++ src/libcamera/software_isp/debayer_egl.cpp | 4 +--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/include/libcamera/internal/egl.h b/include/libcamera/internal/egl.h index e18bb91f4d..8f2ef296c3 100644 --- a/include/libcamera/internal/egl.h +++ b/include/libcamera/internal/egl.h @@ -14,6 +14,7 @@ #include #include +#include #include /* @@ -116,7 +117,6 @@ public: void activateBindTexture(eGLImage &eglImage); void pushEnv(std::vector &shaderEnv, const char *str); - void makeCurrent(); int compileVertexShader(GLuint &shaderId, Span shaderData, Span shaderEnv); @@ -127,6 +127,11 @@ public: void syncOutput(); void flushOutput(); + void assertThread() const + { + ASSERT(tid_ == Thread::currentId()); + } + private: LIBCAMERA_DISABLE_COPY_AND_MOVE(eGL) @@ -140,6 +145,8 @@ private: int createDMABufTexture2D(eGLImage &eglImage, int fd, bool output); + void makeCurrent(); + struct VTable { PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES; PFNEGLCREATEIMAGEKHRPROC eglCreateImageKHR; diff --git a/src/libcamera/egl.cpp b/src/libcamera/egl.cpp index edb00ef997..5e5535f2be 100644 --- a/src/libcamera/egl.cpp +++ b/src/libcamera/egl.cpp @@ -104,6 +104,14 @@ void eGL::flushOutput() glFlush(); } +/** + * \fn eGL::assertThread() + * \brief Assert that the execution is in the right thread + * + * Asserts that the execution is in the thread for which + * the created EGL context has been made current. + */ + /** * \brief Attach a texture to a frame-buffer-object * diff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp index 35a5c56321..97aa037935 100644 --- a/src/libcamera/software_isp/debayer_egl.cpp +++ b/src/libcamera/software_isp/debayer_egl.cpp @@ -578,9 +578,6 @@ int DebayerEGL::debayerGPU(FrameBuffer *input, FrameBuffer *output, const Debaye eGLImage *eglImageIn; eGLImage *eglImageOut; - /* eGL context switch */ - egl_.makeCurrent(); - eglImageIn = getCachedInputFrameBuffer(input, inMapped, inDmaSyncer); if (!eglImageIn) return -ENOMEM; @@ -608,6 +605,7 @@ int DebayerEGL::debayerGPU(FrameBuffer *input, FrameBuffer *output, const Debaye void DebayerEGL::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output, const DebayerParams ¶ms) { + egl_.assertThread(); bench_.startFrame(); /* Copy metadata from the input buffer */