From patchwork Mon Jul 6 11:38:54 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: 27246 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 AD278C330A for ; Mon, 6 Jul 2026 11:39:14 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1BFE466023; Mon, 6 Jul 2026 13:39:14 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="jv6ch5f5"; dkim-atps=neutral Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5F34265EFF for ; Mon, 6 Jul 2026 13:39:12 +0200 (CEST) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-493c1950518so19422195e9.1 for ; Mon, 06 Jul 2026 04:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1783337952; x=1783942752; 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=s3J/NrfJsMXq4eaqAQimcvyIokeKF2MgvnNr4M7DXMo=; b=jv6ch5f5sy41XS74LiRTV0INiZ4dYhr/P3zUci17PlA15ceeDOZqeKvxdMbzhVqjt6 Ia6dwf6LiQByDDWELTA2HIg5VLUZud0gTLAvx+Nl+RzH146EtU+brA89Hsf/xXkwd96W mbrYwbu6A0HPi/k6FqDRy1RMVxb7p3zjpVZ0vHs7i/PdgUtqGWI8FvBmz5w/OwjzSmOw cJ2Y1022arBjr8GmuiouXMfgpAsZS+kDPPzM+izFxXS5WRL8oyJwXCIQ6spE6b/2kDc8 WkMt5BQyqtBs/NyJgsf8BjZUKuZruG3zj/w0Rjit7tXtjv3QO2wsWyhoFjrbrtP6uRId ppAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783337952; x=1783942752; 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=s3J/NrfJsMXq4eaqAQimcvyIokeKF2MgvnNr4M7DXMo=; b=JzXWKYRM3VjXxE/fC/VFfVxDNnK5qQvOqNonX13tWEWfVbaLRNEeH79w+dR5kEErh2 AalOkJ7TSKscGZE3L0/WBB+woIUXGUHxcX/jKAQrZ1L1lXhaxT1qvv68ZGVFuPhA6ASO BpLSH8xyf27vEyslV1VfF8KMkqnTYDPewKOkKWSsJD3/4hPslMESJ5qglX2drFyz/mU+ +2EdZFnjycw8nZ62yx0GlcP3WczS6V3OpwsLPEbXBFDnNqY+duFOqum1trBHN/IwlFQr ke3MHCy1OoexlChnPqxSLbh4Fi5sF2uMT7ElBfIshHcNF0IVj5JNxZxfSMGRbC82BExt cPyw== X-Gm-Message-State: AOJu0YxCr+303pQlckGVXKZ8XdUQGqiDwEIH2eATd9c9WdwcJmiv9oGm TPsElrzrzvREcKcRBowppy8OElicVH+112Tq8XwCaDG/mdtngVOuLXSh/bVvgBwlevNyzVIjUGA cpdHo X-Gm-Gg: AfdE7clQ2lEExzHfH+bOsZ6nJlhMOpcVR2zBAIG8N78fUsqIYmpABSDs39d0r6Y5lJa 4rwm/Y/n6P340vE4LMb2JLwIHAtzC3na1GpZ1V6frYxlpQnZDik8s22yGqspNwYqEerHeHPOuG7 rpZ/SmaCxOhyWs8FF//cRIbiZI2Zh4hUl3p+wOcDRQx+33BgsdVCc9sPBSWibPETMRbj97lkpIO PG+NIyrnLH7pkg4T1pbT8FCqMTXvYn2yXmZmSWTop/01qZNTF7wnuwSZIpNY0oCrcwisndEVWW1 UGGtE/rPc2jaI7uMKdbyH5RSeg8d5DeBBG2alMpC/hgOC0k2AJZdT/NGYEyrXPE5dxD4JIgQWyJ 5vuWp9aomNTuibtm+YEe/I1Q4hafuZXD4thIVFTuT7F2fD0s3rbVGuS+nGrLGEVZT/a9Pv33oZI XslRxpi0zoMYRYy80rWkTfVB2wGPhe X-Received: by 2002:a05:600c:1908:b0:493:d3c5:6c32 with SMTP id 5b1f17b1804b1-493decbf10amr4212745e9.6.1783337951887; Mon, 06 Jul 2026 04:39:11 -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:11 -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 1/7] libcamera: software_isp: debayer_egl: Pass eglImage as parameter to setShaderVariables Date: Mon, 6 Jul 2026 12:38:54 +0100 Message-ID: <20260706113900.2530549-2-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" We will create a cache of textures and eGLImages which means the value assigned to the shader texture unit will come from one of those now cached eGLImage objects. Pass eGLImage as a parameter to facilitate future differentiation. Reviewed-by: Robert Mader Reviewed-by: Milan Zamazal Signed-off-by: Bryan O'Donoghue --- src/libcamera/software_isp/debayer_egl.cpp | 6 +++--- src/libcamera/software_isp/debayer_egl.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp index 56545816e..c3a7b7952 100644 --- a/src/libcamera/software_isp/debayer_egl.cpp +++ b/src/libcamera/software_isp/debayer_egl.cpp @@ -388,7 +388,7 @@ uint32_t DebayerEGL::preferredInputStride(const PixelFormat &inputFormat, const return info.stride(size.width, 0, 256); } -void DebayerEGL::setShaderVariableValues(const DebayerParams ¶ms) +void DebayerEGL::setShaderVariableValues(eGLImage &eglImageIn, const DebayerParams ¶ms) { /* * Raw Bayer 8-bit, and packed raw Bayer 10-bit/12-bit formats @@ -444,7 +444,7 @@ void DebayerEGL::setShaderVariableValues(const DebayerParams ¶ms) * To simultaneously sample multiple textures we need to use multiple * texture units */ - glUniform1i(textureUniformBayerDataIn_, eglImageBayerIn_->texture_unit_uniform_id_); + glUniform1i(textureUniformBayerDataIn_, eglImageIn.texture_unit_uniform_id_); /* * These values are: @@ -533,7 +533,7 @@ int DebayerEGL::debayerGPU(FrameBuffer *input, FrameBuffer *output, const Debaye /* Generate the output render framebuffer as render to texture */ egl_.createOutputDMABufTexture2D(*eglImageBayerOut_, output->planes()[0].fd.get()); - setShaderVariableValues(params); + setShaderVariableValues(*eglImageBayerIn_, params); glViewport(0, 0, width_, height_); glClear(GL_COLOR_BUFFER_BIT); glDrawArrays(GL_TRIANGLE_FAN, 0, DEBAYER_OPENGL_COORDS); diff --git a/src/libcamera/software_isp/debayer_egl.h b/src/libcamera/software_isp/debayer_egl.h index 4c7c86472..348d7305b 100644 --- a/src/libcamera/software_isp/debayer_egl.h +++ b/src/libcamera/software_isp/debayer_egl.h @@ -65,7 +65,7 @@ private: static int getOutputConfig(PixelFormat outputFormat, DebayerOutputConfig &config); int initBayerShaders(PixelFormat inputFormat, PixelFormat outputFormat); int getShaderVariableLocations(); - void setShaderVariableValues(const DebayerParams ¶ms); + void setShaderVariableValues(eGLImage &eGLImageIn, const DebayerParams ¶ms); int debayerGPU(FrameBuffer *input, FrameBuffer *output, const DebayerParams ¶ms, std::optional *mappedInputBuffer, std::optional *inputBufferDmaSyncer); /* Shader program identifiers */