From patchwork Thu Nov 27 02:37:19 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: 25241 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 30ADEC3257 for ; Thu, 27 Nov 2025 02:37:57 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D3FDF60AB1; Thu, 27 Nov 2025 03:37:56 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="TdpOOZze"; dkim-atps=neutral Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C8E62609DE for ; Thu, 27 Nov 2025 03:37:54 +0100 (CET) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-47796a837c7so1861955e9.0 for ; Wed, 26 Nov 2025 18:37:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764211074; x=1764815874; 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=H5BShESTnB/MbwTFxOodjFsYW/bRikVrhmyhH5umiF8=; b=TdpOOZze7obc7NMTqFuM+WwvQkHO980oM7GUTLJ2GFvT71iI5ivvZGhaXRzcGeyj2J 1HuaF+GSC1AZdhBZMzVrikTIaQrvE38lQ/lTf5Qnj01lIi+ksmfBz9VYjbCa1ayus/0k kyJIUjrSZKygIe9du/G3fzE3LBe8+yRByE0uTvn0bGHNf+Pu3cSYfyCGphzO9WTFr37Q sPW8zWdd2UGxg2+D5g43/k/M6AB7s0XYnpPIEEcKyJu70g1r8DyJqKOPZqrk/EaJZmsA q4ZldhbNNYxeXcKJTWouTfj84JmLx9RaP5i8F9fpJddIaFlcpNQaNQ+0qVk8umSkyHH8 B+3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764211074; x=1764815874; 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=H5BShESTnB/MbwTFxOodjFsYW/bRikVrhmyhH5umiF8=; b=uQaVw+IEGM0RPdjZM21MkqxerKrWogRHVehZQA4otsvTaaOo638/1UkW/50GI+4rPJ YPfcKKmMnucf8w/mMOWyTueOzaiJ12VLoUUSwkvTezndv2r5mYrtmmrmzeuKjhJLj5XC GzfB9m65IWfd3NlAZG+H/vAAcVzDFqKCYJthDXx7/ZGEt4iVgWJt3IkIR/BJkzMyuAv1 vI/KhdtOCLDIC/LqMHWrdwXwlfANGeijnAByRUfiKYyU4VObW6HWiDcHz0s+huk3YHYj PV95LWXzm5kWgbGTokrR0MPJ1x2D7J7z5fnfDG2AoK8kc/+akaEB05t51eaUWFDguThg eKOg== X-Gm-Message-State: AOJu0YzPZ3MxBFA3pTWYkVQSZhAvr7Oq/eRfPl3ZEOKkkmJxcxQ9yAI2 /dKp5rslQU/hZsk//aC6eD/4Qg/PKQo7x91DS9OZjd+EW8bAcYAmvyBePAmaD0So/Pv9R4W5+FO ukZ5zzes= X-Gm-Gg: ASbGncup4arawJTadrCdchE2Ved51QylpGUAsv/zAooklEOxc8/UNie4LehoWgHZngG 7G73eKV6V5he0MO0QSjJBKgFNTBhNDAERMUhP31nO++yrANgc1hOEyYHGNYOXjdyoPhzUNdktsR tlpiJaiCLczphMAsw8sPbWLDoDD8qb6bJBlUWovv/Fb4liwOVdaDTb8/eg+XfNJrodDsYB8lYBo YmUBik+ZKkAjr49lm6eTiJg9WouZ7iUqCL8lubOMuKIF9iXj2qgidQ8yP3CW1tGHAWM/vNWnm9L oYVixO1WStzpT0IHB5wm3MKFWtxr9heEGcxRKS5jwInJbU7TpM3uAr/siRW5DX0vcHOPNJvqVcQ Mu3PIjptUq8OJ51ZZvolxrDbF589XZ8YneEnDCF1vmXAPhqiW9VuScqR2Q83dAwNdLFtZAJJnDS EEzJKrIcmrOZjo8hBEuz+zrHvWjQiLDNyo9+iDRxu6+YAzqrtE93xZv69igH81HteOm+Uz22E1e aD1NA== X-Google-Smtp-Source: AGHT+IEL/kmIbL+KeAF1if82xyP20U6ve1NzbERLhte1Yh7aUs38gS7/IjndlaaXMmUVHPF8dM6MHg== X-Received: by 2002:a05:600c:2296:b0:477:73e9:dbe7 with SMTP id 5b1f17b1804b1-477d24871d6mr86409195e9.35.1764211073989; Wed, 26 Nov 2025 18:37:53 -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-4790552c3c9sm58186345e9.0.2025.11.26.18.37.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 18:37:53 -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 v5 04/24] libcamera: shaders: Rename bayer_8 to bayer_unpacked Date: Thu, 27 Nov 2025 02:37:19 +0000 Message-ID: <20251127023739.179652-5-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251127023739.179652-1-bryan.odonoghue@linaro.org> References: <20251127023739.179652-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 1554c94d5..b0c8ecaf8 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', ])