From patchwork Wed Dec 17 10:01:16 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: 25577 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 72450C3272 for ; Wed, 17 Dec 2025 10:01:55 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7B0E461A5B; Wed, 17 Dec 2025 11:01:54 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="RwWOmEhZ"; dkim-atps=neutral Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 56EC761A35 for ; Wed, 17 Dec 2025 11:01:47 +0100 (CET) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-477aa218f20so37293435e9.0 for ; Wed, 17 Dec 2025 02:01:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765965707; x=1766570507; 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=IkJAuqeYrqHSkFYcCTDfg5+OJJh/GJhI6Eleh7WU2G8=; b=RwWOmEhZ6UB4QM3KhH9vQdpSOo3oyGd4/y3gSg8NL6sAQjxpFxbW7vNhNw0dwlv5to cUGa5KZlnIY6P1z/Bx8XtSQZVOK2kuWkJ8xMX6LSdKLcQqMVarihYadHm3fuFXXkI0G4 6Wc5grcmcpiOx3BQa2Hme30/tNppCbJDzhnHIl+W2KsUNd67bRUwHHDCqY4yBfTvIIkl SIOXeJo1XYx9raqt6Av2ZGdRusxubwJHxVhZgrwCOcP2KrbMvcfdCanjdr4uYVAKcCs5 o3bALQutFPhrcYJx7po2m1dTQ+jyJKVFkpFsjrFeLZXl3biRCAXM4aWl82t8DQprSiqg 6jMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765965707; x=1766570507; 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=IkJAuqeYrqHSkFYcCTDfg5+OJJh/GJhI6Eleh7WU2G8=; b=XFOJjRPxMet2FD5ukSjm9pn4uWOkXlp13nsd9avizTLszYJ9enbdLe3NXCxt0N1wVm Xaw0aay/MFHp34zSK6mwVC8noqCwuOc51SNrYlt44+cxbRRk3PO/wPa6lNe8xL5USiek +zdpTyu1PJcB++k6BXT+CWSCjAMda21EF7NIOY2fpru5LL4jEvCNP9aDkNgUrvc77fff 3kX29SbuNaYB5Eo2cVx7QzzYWwA03kvp1HiVs+cgbkkKxN8daaNZoqkSaa59vaLQj0fz x1ZSrw0TmUvK2Q1IlZcS6YS8nOHwyF498wPdIb1uDQvv4u+OF3k+JnOPLToKFmJG0S3v 10ZQ== X-Gm-Message-State: AOJu0Yz2DHWJcRiw7UQmRje53skhzt4do2x+znqn48iXouVEJ7niQJtd FS39vo0eulyNVs+dn/M6x5GjKhyyNWg9WaY8e8XdksacRsmXyt9ZgBWfeODxdAiro+lM7aF3WpZ Kg09v X-Gm-Gg: AY/fxX6odvXs6HrEkZ5ZfpDl0Z47Zea3zxVLY1m92qDdhKwV2YC1rh0S9c5RgY4aYHB yE6AhGc9phD95x/G5mykGbpfDDnGpF0L4FcppNlrG7+HHb0vBP8TxmHx6oAzJuzWAa/aK3uxnb1 xwPvsXuQ1oDJ5pFKbWBrpb7XRxnlUa3F7J2d9WtyWevmyK02IUOfyRVoC4+XCSKqy82zagc1P4/ 6D+wXK9iu8SPwh2faZvFRXdeW98ZvOJ6z3RryC6WrWBF87pzRIbFY2x87tmvqkgB5zDUuir9Ra7 Ek9U85c/x576g2rt7g84EJ1j6vK0+60QSxdjDUge2KKyanG21exlDaibMgV9VuQBmrrBUkcaT9i YTrAl/oNanFsgy3VH0jvWEvcfoOeqYbUiybYr7uviGD+bQFid8K1r5BCrffaXO7rG2pauEAQ9eu qjpf1/gzASYtlERAeDqmfspoPCw/g0ZAQy8QbpuHQn9uDS32+KRAh0DwLLQ9NI+QTz1FJ4/574O LLlMQ== X-Google-Smtp-Source: AGHT+IHdlmgm8g6MDlSgIC5JoC0PP8rGUZFJaH5lIRe5XSBfD3E7shwSAro3PxYnBZG1hVFQrabfNA== X-Received: by 2002:a05:600c:1c2a:b0:477:6d96:b3c8 with SMTP id 5b1f17b1804b1-47a8f905313mr190061065e9.23.1765965706612; Wed, 17 Dec 2025 02:01:46 -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-47bdc1583fbsm32292585e9.0.2025.12.17.02.01.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Dec 2025 02:01:46 -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 v9 04/26] libcamera: shaders: Rename bayer_8 to bayer_unpacked Date: Wed, 17 Dec 2025 10:01:16 +0000 Message-ID: <20251217100138.82525-5-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251217100138.82525-1-bryan.odonoghue@linaro.org> References: <20251217100138.82525-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 4698c5aac..47f41350e 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', ])