From patchwork Mon Oct 26 12:20:00 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: coolGi X-Patchwork-Id: 28614 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 A38B9C324C for ; Mon, 26 Oct 2026 12:20:42 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B5E7C68FEF; Mon, 26 Oct 2026 13:20:41 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=collabora.com header.i=remy.alipoursafari@collabora.com header.b="j+I/sX4s"; dkim-atps=neutral Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7558E68FD7 for ; Mon, 26 Oct 2026 13:20:37 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; t=1793017233; cv=none; d=zohomail.com; s=zohoarc; b=ENNgc5StjObSVoikFXCVz4Fa10kOilkUv+tith21eWWSRd0A9jff+LaALGwv4mYMxSRZRkzr/5SrErpz2dcrE9gJYL984oBnDZXLy85jySE6EK0kCLuQjLQZAE11GYyX3HjbVkLeo+1Vk9rjqXUrr5iYEKH9AX+0G/h7QYpG8LM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793017233; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=MhXlViRoGLF2P2xWW4IKkoDsBSDfX5NwlHUVyobLA7E=; b=QkS+GeyJ1VQhNZB7kEQSzizY81wjoImm2FxltMwY6lWeUy4cneNWj8fCtsChIwRE6oZa1l/LIoeWFzYezbtefxSSvR6oMtTNEwsVRpu7pps0Rah+UOWtAHtsacrIatHXkgD5Z1xztlxd3RI4rYrWJtWTGvrjnWBevYAPWmTSrCE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=remy.alipoursafari@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1793017233; s=zohomail; d=collabora.com; i=remy.alipoursafari@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=MhXlViRoGLF2P2xWW4IKkoDsBSDfX5NwlHUVyobLA7E=; b=j+I/sX4s57dzRx2ivNNytZN0yxWsCHrhMOLWLBbTFeS3EYFWm2C43u0eSsdZcYUU eYpl7jEkVRpQgNWhTXOqr2Eq8hePESINfeIaUAiehoE1Yzdnjx/avSJfqvqokK2bRyM 88JYABbU8ZHUD1cR9fkftu1leCxy+AAsQA3ASHNY= Received: by smtp.zohomail.com with SMTPS id 1793017232197931.9002226331561; Mon, 26 Oct 2026 05:20:32 -0700 (PDT) From: coolGi To: libcamera-devel@lists.libcamera.org Cc: coolGi Subject: [PATCH 3/4] libcamera: software_isp: debayer_egl: Remove redundant return value of getShaderVariableLocations Date: Tue, 27 Oct 2026 01:20:00 +1300 Message-ID: <20261026122014.61707-4-remy.alipoursafari@collabora.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261026122014.61707-1-remy.alipoursafari@collabora.com> References: <20261026122014.61707-1-remy.alipoursafari@collabora.com> MIME-Version: 1.0 X-ZohoMailClient: External 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" Signed-off-by: coolGi --- src/libcamera/software_isp/debayer_egl.cpp | 7 ++++--- src/libcamera/software_isp/debayer_egl.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp index 300822f9..55fd30cb 100644 --- a/src/libcamera/software_isp/debayer_egl.cpp +++ b/src/libcamera/software_isp/debayer_egl.cpp @@ -97,7 +97,7 @@ int DebayerEGL::getInputConfig(PixelFormat inputFormat, DebayerInputConfig &conf return -EINVAL; } -int DebayerEGL::getShaderVariableLocations(void) +void DebayerEGL::getShaderVariableLocations(void) { attributeVertex_ = glGetAttribLocation(programId_, "vertexIn"); attributeTexture_ = glGetAttribLocation(programId_, "textureIn"); @@ -127,7 +127,6 @@ int DebayerEGL::getShaderVariableLocations(void) << " stride_factor " << textureUniformStrideFactor_ << " tex_bayer_first_red " << textureUniformBayerFirstRed_ << " proj_matrix " << textureUniformProjMatrix_; - return 0; } int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputFormat) @@ -268,7 +267,9 @@ int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputForm return -ENODEV; } - return getShaderVariableLocations(); + getShaderVariableLocations(); + + return 0; } int DebayerEGL::configure(const StreamConfiguration &inputCfg, diff --git a/src/libcamera/software_isp/debayer_egl.h b/src/libcamera/software_isp/debayer_egl.h index 30e51a47..20c8a0b1 100644 --- a/src/libcamera/software_isp/debayer_egl.h +++ b/src/libcamera/software_isp/debayer_egl.h @@ -64,7 +64,7 @@ public: private: static int getInputConfig(PixelFormat inputFormat, DebayerInputConfig &config); int initBayerShaders(PixelFormat inputFormat, PixelFormat outputFormat); - int getShaderVariableLocations(); + void getShaderVariableLocations(); void setShaderVariableValues(eGLImage &eGLImageIn, const DebayerParams ¶ms); int debayerGPU(FrameBuffer *input, FrameBuffer *output, const DebayerParams ¶ms, std::optional *mappedInputBuffer, std::optional *inputBufferDmaSyncer);