From patchwork Tue Dec 2 13:45:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 25313 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 24586C32AF for ; Tue, 2 Dec 2025 13:46:02 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id AF92B60D0C; Tue, 2 Dec 2025 14:46:01 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="mNCmal8f"; dkim-atps=neutral Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5490260C77 for ; Tue, 2 Dec 2025 14:45:58 +0100 (CET) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4775e891b5eso23291605e9.2 for ; Tue, 02 Dec 2025 05:45:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764683158; x=1765287958; 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=lV+JLx0+P4aigKpifcEHa5VvxL7Qodjjb3+3JXtFVoo=; b=mNCmal8fhLkDwziuGOZsSVCGbohKLLmKxY3MUBR1Il81FR4DYM78+dfeM9DOurVwM4 a7bNeOXtzeghcF6RbYJP+XVISgsZ08zFxPqSckFZ4MNtbSuq58PJkOO/3MrDpKUKcCPT PKeR2OJagSBLUShgvANFRroKGVg/OKElW0Cs8WW90khLitixAPMN0ths+ehrbUmDAexS DxoLXvUGf//o6YzHOwmR5MODstevwzeGZ01WY+78I+vTOmuGgbWP1OltJEa+Ag9JrYQM DoxBLL7y1MBwlNqv6KcrxTFXXuttdw2mbfMJw2e99I2A/CACWGABMJgveBCamDq+50SO 4MKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764683158; x=1765287958; 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=lV+JLx0+P4aigKpifcEHa5VvxL7Qodjjb3+3JXtFVoo=; b=LhjTzlueXSO3vu6MDiJh+KpUgPmniU7Yo9ttU7ERfyIt7Vm1eyGWj8vZ6vIqfX+Edf BCpWbihlDM3ElI66MUDt2RNo2e9MLVPd06ObnX/pyLdzBAKCQv5MqwduC4rLCN9aKijX z11UjwMh5RJubuTgylSC6HAacpPOF6b5G1b8VPl4eIDcTRUSRX4vWEq+P/806x94OHUo cpKv22r1+2QA+XXo6hYvnxkL1KXprCSBwl0Ri/TYM2OtrYXsiXXFL5TE5kotf7YIEfMo kHW0KdfOVMsH311OhWHRxdwFm7Wf1cjXpGWEEmugZFcjWEmej7jgJed1bTBC1CvznnTA lr6Q== X-Gm-Message-State: AOJu0YyyuRjb1t7lSWLMvokGj8S/NL+DMGxUZMCcimz8WG1qlJNSRtei wrNvhNd/2k1CMdfr+5JONFygu+QvSB7H/WqM3c+cOCpTA1LgtuZJtaAEXWzqZFluUCFr+xvc0Lo 2awgd X-Gm-Gg: ASbGnctIso3mI81p+OQ2yCtPWaj6/dHKpG/lshs8Y2szefB2x+ua6KPOXl8s2SYa1sx lVMyE/9EtyCgplCGnsg1q23x7Cp88tlSDbdAwVoMwwr+Y2CFaD+cF5a2KODc0xUtv8mQflNaLeH Mh1gBbbM4Z655PpHz+ByRWz6HgHTaqS3Jgp4pZra2G7sDKP5uxvn+Nbw2XOwHxvztzz3iBMmeII Kacx606e1F3m38cb64+PY3ZJd4f4Pquz5oOE13evT0WNErTIsSfhNIgZaSHFaq2Ufm1E//auHs8 DhQ9APKzx/TFdVePik71r/kVr6kcFNu9ks4iMQ+pw+Kha3B5LUg1AbGO7cZDOnib2c2jLOhE56w qZxVgKnybMMI01zt45mGV12H24ORgQe77mS3lSgPQw6eCIzycuEZRGFKD8pLe14xQ4UApxCdTNg /dsoDvWTK8fDx4It45DtCYbMyxrLhKGg5TkLWuVC+kIOQ0ukHwX2Ef7HPYeo307XS8Y28= X-Google-Smtp-Source: AGHT+IHxkjtXhWVmVNDuHeY9tIV/UvNU0R57KLBDKaCdjqkF78LijCT/ZUqhd+4JYxEr5Og1DoH1pA== X-Received: by 2002:a05:600c:3baa:b0:475:de12:d3b5 with SMTP id 5b1f17b1804b1-477c01ecc7cmr430279725e9.34.1764683157465; Tue, 02 Dec 2025 05:45:57 -0800 (PST) Received: from inspiron14p-linux.ht.home (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47926f0ec69sm19383375e9.1.2025.12.02.05.45.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Dec 2025 05:45:56 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Milan Zamazal , Kieran Bingham , Bryan O'Donoghue Subject: [PATCH v6 04/24] libcamera: shaders: Rename bayer_8 to bayer_unpacked Date: Tue, 2 Dec 2025 13:45:24 +0000 Message-ID: <20251202134544.662446-5-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251202134544.662446-1-bryan.odonoghue@linaro.org> References: <20251202134544.662446-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" From: Milan Zamazal bayer_8.* shaders are now used for all unpacked sensor data formats, regardless of the pixel bit width. Let's rename the "8-bit" shaders to avoid confusion. Signed-off-by: Milan Zamazal Reviewed-by: Kieran Bingham Signed-off-by: Bryan O'Donoghue --- src/apps/qcam/assets/shader/shaders.qrc | 4 ++-- src/apps/qcam/viewfinder_gl.cpp | 16 ++++++++-------- .../{bayer_8.frag => bayer_unpacked.frag} | 0 .../{bayer_8.vert => bayer_unpacked.vert} | 0 src/libcamera/shaders/meson.build | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) rename src/libcamera/shaders/{bayer_8.frag => bayer_unpacked.frag} (100%) rename src/libcamera/shaders/{bayer_8.vert => bayer_unpacked.vert} (100%) diff --git a/src/apps/qcam/assets/shader/shaders.qrc b/src/apps/qcam/assets/shader/shaders.qrc index 7369cdbe8..f11a68ef2 100644 --- a/src/apps/qcam/assets/shader/shaders.qrc +++ b/src/apps/qcam/assets/shader/shaders.qrc @@ -6,8 +6,8 @@ ../../../../../src/libcamera/shaders/YUV_3_planes.frag ../../../../../src/libcamera/shaders/YUV_packed.frag ../../../../../src/libcamera/shaders/bayer_1x_packed.frag - ../../../../../src/libcamera/shaders/bayer_8.frag - ../../../../../src/libcamera/shaders/bayer_8.vert + ../../../../../src/libcamera/shaders/bayer_unpacked.frag + ../../../../../src/libcamera/shaders/bayer_unpacked.vert ../../../../../src/libcamera/shaders/identity.vert diff --git a/src/apps/qcam/viewfinder_gl.cpp b/src/apps/qcam/viewfinder_gl.cpp index 69b7c6e59..ea957dc65 100644 --- a/src/apps/qcam/viewfinder_gl.cpp +++ b/src/apps/qcam/viewfinder_gl.cpp @@ -235,29 +235,29 @@ bool ViewFinderGL::selectFormat(const libcamera::PixelFormat &format) case libcamera::formats::SBGGR8: firstRed_.setX(1.0); firstRed_.setY(1.0); - vertexShaderFile_ = ":src/libcamera/shaders/bayer_8.vert"; - fragmentShaderFile_ = ":src/libcamera/shaders/bayer_8.frag"; + vertexShaderFile_ = ":src/libcamera/shaders/bayer_unpacked.vert"; + fragmentShaderFile_ = ":src/libcamera/shaders/bayer_unpacked.frag"; textureMinMagFilters_ = GL_NEAREST; break; case libcamera::formats::SGBRG8: firstRed_.setX(0.0); firstRed_.setY(1.0); - vertexShaderFile_ = ":src/libcamera/shaders/bayer_8.vert"; - fragmentShaderFile_ = ":src/libcamera/shaders/bayer_8.frag"; + vertexShaderFile_ = ":src/libcamera/shaders/bayer_unpacked.vert"; + fragmentShaderFile_ = ":src/libcamera/shaders/bayer_unpacked.frag"; textureMinMagFilters_ = GL_NEAREST; break; case libcamera::formats::SGRBG8: firstRed_.setX(1.0); firstRed_.setY(0.0); - vertexShaderFile_ = ":src/libcamera/shaders/bayer_8.vert"; - fragmentShaderFile_ = ":src/libcamera/shaders/bayer_8.frag"; + vertexShaderFile_ = ":src/libcamera/shaders/bayer_unpacked.vert"; + fragmentShaderFile_ = ":src/libcamera/shaders/bayer_unpacked.frag"; textureMinMagFilters_ = GL_NEAREST; break; case libcamera::formats::SRGGB8: firstRed_.setX(0.0); firstRed_.setY(0.0); - vertexShaderFile_ = ":src/libcamera/shaders/bayer_8.vert"; - fragmentShaderFile_ = ":src/libcamera/shaders/bayer_8.frag"; + vertexShaderFile_ = ":src/libcamera/shaders/bayer_unpacked.vert"; + fragmentShaderFile_ = ":src/libcamera/shaders/bayer_unpacked.frag"; textureMinMagFilters_ = GL_NEAREST; break; case libcamera::formats::SBGGR10_CSI2P: diff --git a/src/libcamera/shaders/bayer_8.frag b/src/libcamera/shaders/bayer_unpacked.frag similarity index 100% rename from src/libcamera/shaders/bayer_8.frag rename to src/libcamera/shaders/bayer_unpacked.frag diff --git a/src/libcamera/shaders/bayer_8.vert b/src/libcamera/shaders/bayer_unpacked.vert similarity index 100% rename from src/libcamera/shaders/bayer_8.vert rename to src/libcamera/shaders/bayer_unpacked.vert diff --git a/src/libcamera/shaders/meson.build b/src/libcamera/shaders/meson.build index 386b342d0..dd441a577 100644 --- a/src/libcamera/shaders/meson.build +++ b/src/libcamera/shaders/meson.build @@ -4,7 +4,7 @@ # for the purposes of inclusion in OpenGL debayering shader_files = files([ 'bayer_1x_packed.frag', - 'bayer_8.frag', - 'bayer_8.vert', + 'bayer_unpacked.frag', + 'bayer_unpacked.vert', 'identity.vert', ])