From patchwork Sun Aug 24 00:48:47 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: 24220 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 CAD16C32BB for ; Sun, 24 Aug 2025 00:49:48 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2BD0269345; Sun, 24 Aug 2025 02:49:48 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="lvxMuKEd"; dkim-atps=neutral Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E5EEB69328 for ; Sun, 24 Aug 2025 02:49:08 +0200 (CEST) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-45a1b0cd668so17315795e9.3 for ; Sat, 23 Aug 2025 17:49:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755996548; x=1756601348; darn=lists.libcamera.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=/20L6tlWwYRY8DTJuz1yDUOAn1XNk35+RBXylKD+rFA=; b=lvxMuKEdYpK2d7zYrz+HaPL/01LLKyFJmd3QE34H0Pz2br578gWe0SdxYk0O5bQvf+ 8nx0Y4l78U2+JZuEkhU9qeSkiCTTz4fIIq15mEPPdunyE87wxlJ0xESM37DcPrm/ykwM CFAarHtR2yTNnK5xlyIIaekR4/Z3lp3l9AHD84GDgAGhHG4OWI0lRVc8VEE0tCesORO3 Is2o8IKQnOnI6PBxFSOfKxpzFtJmfxWaZESqKSnBpXh82cfdfX9YRWGIv0ucd1YEYC0c 8oyl8qESgeUXU8xhv533ip9yNxi+DD6MD+WTgzF/taqsQ/SUi9OexD2jsJ8VrAuHEuiJ nuAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755996548; x=1756601348; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/20L6tlWwYRY8DTJuz1yDUOAn1XNk35+RBXylKD+rFA=; b=FR9ZuaX4opDomwvvbnOC+1O2m7irhJuYsa8xcWUrHeqs/R4lCDgT8VjFF2fEYkJZHF +dI04JRv8hUYyeWEwsq86mCJrFoVEKz4GmNMvramXkFDT73+YVq4LdZuZ+kk33wS7joO //7vrIU6EjUCriykfcrQ0xhz4k68E/U0y6T6OZUhqSVNlnfeJmkcVeSvU9wuyd7qNxFB thjkIjPbE4a8ljE2924e3EcVcmMW9Z585+2z/O5RSLIQ2zzcWN0iyc+J+AS3KJBKAOoX WnSi/QRjFKxhvmd1hVNILE/lNP4WY2+MBfGrkwYbu5b9ZIPEcXglPRTdkomIobniB2yj kNng== X-Gm-Message-State: AOJu0YzieL/67cxEXuC1XKDNbtm2M+sP34Ml7uYr1W0MsQbMKC7cB5rA ce4a1nUv5i3uV5eTEx1IG0XrgGoViHX5BQL0zY7T+FMoacElwcZthZLl2/DBXtolmKM= X-Gm-Gg: ASbGncvY5YlqVzhKh1uku9k081mcBsz6YPzFK4IYzVd2OKWiuan7h1wE/vB71Z4l3Ka 2jQ+I7jpAfNwJGQcs/AXbYoWkXFX8Vxj/hSiqZnAHxg9tGMT3CWgPVl+FCQuPXqMLCY5UpH1pJC P3agd6AYkuHQxkMWyo15FXQUjxM/Dx39gj4lb9PGc6emdHjrl/JVy7ofjQItjUe79r5zyFXTdvj ZrSiROiJ4/ZIMO7bL/KGKqnAY3w1kHNNuMxA783nB+nifaBMG+t0zMp1yZfbK99AbdoHHmzfafc r42ayHEvJMNCyTZcRDaT94SF0SHdf3U8yRTkJTuXU3liv+VHrpRFVJkbDNOCoN3EEX8sePoPt8n khT30z6h1vErgy75tkv/vFPc+DkgAhTwTyZUFu/nhiEMiNFsoRZVPT9bdK03MpN650st3E+IWm+ BNevfIL1e2jpMBd51eQgBB X-Google-Smtp-Source: AGHT+IEoi3qCLFocZrehiwxSFAFr0fz3ssI2gs1Sct6GYXBtcHNxL2qMbpoPdXMBKPl9fJNXlOoLoQ== X-Received: by 2002:a05:600c:4687:b0:45b:47e1:ef71 with SMTP id 5b1f17b1804b1-45b517f8e7fmr62114425e9.36.1755996548467; Sat, 23 Aug 2025 17:49:08 -0700 (PDT) Received: from [192.168.0.13] (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b4e1d530esm69347225e9.0.2025.08.23.17.49.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Aug 2025 17:49:08 -0700 (PDT) From: Bryan O'Donoghue Date: Sun, 24 Aug 2025 01:48:47 +0100 Subject: [PATCH v2 35/37] libcamera: shaders: Rename bayer_8 to bayer_unpacked MIME-Version: 1.0 Message-Id: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-35-96f4576c814e@linaro.org> References: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-0-96f4576c814e@linaro.org> In-Reply-To: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-0-96f4576c814e@linaro.org> To: libcamera-devel@lists.libcamera.org Cc: Bryan O'Donoghue , Milan Zamazal X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5027; i=bryan.odonoghue@linaro.org; h=from:subject:message-id; bh=IVK2WYEtHjy9TXfF8vGpMJ8qVd56wUL9Oe+1YL++eaA=; b=owEBbQKS/ZANAwAKASJxO7Ohjcg6AcsmYgBoqmFir+ayVXY3yuTjtQp+DlZrar520kT73UOK7 xSgOLd4y5yJAjMEAAEKAB0WIQTmk/sqq6Nt4Rerb7QicTuzoY3IOgUCaKphYgAKCRAicTuzoY3I OgI4D/9zkgFS4p9cBsWKhNMw8Dzn7apX+wlYVaYlu3wqOlVqurWX11SZ7J4KL8h+7mqbtu+59dC Gd0qfxg68P/m+ps6lS8ukaVmpxiy1Il0b5QGClmHOnys5XWV7imcw+blG/Y6FiMivufEkbD2H58 UVcPdrPoNOd9LG/H75csDQk32vV+STaz4UnMY5DiKRaQ1/f66Gbv049JLduOMzeGHWuhlSOCYbN iDjRLsoFlvWNy7rmSTo/hy0DV9r/szA9sBnFaupWz+LJ8wGoO6dAUkQYHTEIoKWHrKeLOAazsRP rnjiuzY8Hi6wZrIBYkURmAMsJWLLH5pyFco/oHEY/6QGvArEJlfLaBwG3VJQRwuxAx7dwHgne8V 9GpLz/sdOD+qg2RAy6MFVN1ugrmtQF97cWx/djrX7y2HjsqIL6Az9GGrGTiVeVv6pFOst4xCBv2 czVykFK7vjyDGgPdJOjgeLREsgRcctyj3Ecp4EjwpFr7dNnEk1p4K8FysHUi/L1BeGhMTxAgvsJ OsdiInvcRJwqXJrKQvcl7PqAhQYGv1TGKkMZN79lMscSQ/tkvqMyEs8aea/DIh1Dd4x4Ds/6Lsn q3Ro3MaI7lzJRmgGRpj4icEoBcwfFZ24x2zDM83MHhlXVHsjy2PEWVJjYc2DixzsULdHSfEcUma lI4T8Kaj2dC93mw== X-Developer-Key: i=bryan.odonoghue@linaro.org; a=openpgp; fpr=E693FB2AABA36DE117AB6FB422713BB3A18DC83A 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 Signed-off-by: Bryan O'Donoghue --- .../shaders/{bayer_8.frag => bayer_unpacked.frag} | 0 .../shaders/{bayer_8.vert => bayer_unpacked.vert} | 0 include/libcamera/internal/shaders/meson.build | 4 ++-- src/apps/qcam/assets/shader/shaders.qrc | 4 ++-- src/apps/qcam/viewfinder_gl.cpp | 16 ++++++++-------- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/libcamera/internal/shaders/bayer_8.frag b/include/libcamera/internal/shaders/bayer_unpacked.frag similarity index 100% rename from include/libcamera/internal/shaders/bayer_8.frag rename to include/libcamera/internal/shaders/bayer_unpacked.frag diff --git a/include/libcamera/internal/shaders/bayer_8.vert b/include/libcamera/internal/shaders/bayer_unpacked.vert similarity index 100% rename from include/libcamera/internal/shaders/bayer_8.vert rename to include/libcamera/internal/shaders/bayer_unpacked.vert diff --git a/include/libcamera/internal/shaders/meson.build b/include/libcamera/internal/shaders/meson.build index 386b342d03b106e8303121ae9b84b2d2ee4e96d8..dd441a5776700f6ffc17eb9e73652d728aee02c9 100644 --- a/include/libcamera/internal/shaders/meson.build +++ b/include/libcamera/internal/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', ]) diff --git a/src/apps/qcam/assets/shader/shaders.qrc b/src/apps/qcam/assets/shader/shaders.qrc index 04f9d7061b16d0bcd6c1fe1aceeaac97bf0fc295..32dfa51bfef01b3a80a4255fe83807f9b76cdbf5 100644 --- a/src/apps/qcam/assets/shader/shaders.qrc +++ b/src/apps/qcam/assets/shader/shaders.qrc @@ -6,8 +6,8 @@ ../../../../../include/libcamera/internal/shaders/YUV_3_planes.frag ../../../../../include/libcamera/internal/shaders/YUV_packed.frag ../../../../../include/libcamera/internal/shaders/bayer_1x_packed.frag - ../../../../../include/libcamera/internal/shaders/bayer_8.frag - ../../../../../include/libcamera/internal/shaders/bayer_8.vert + ../../../../../include/libcamera/internal/shaders/bayer_unpacked.frag + ../../../../../include/libcamera/internal/shaders/bayer_unpacked.vert ../../../../../include/libcamera/internal/shaders/identity.vert diff --git a/src/apps/qcam/viewfinder_gl.cpp b/src/apps/qcam/viewfinder_gl.cpp index 70f600650b7b925f10d2f699e6498a6cbd0a238a..95965ab7170e5ea951869dda83537ed0bca9978d 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_ = ":include/libcamera/internal/shaders/bayer_8.vert"; - fragmentShaderFile_ = ":include/libcamera/internal/shaders/bayer_8.frag"; + vertexShaderFile_ = ":include/libcamera/internal/shaders/bayer_unpacked.vert"; + fragmentShaderFile_ = ":include/libcamera/internal/shaders/bayer_unpacked.frag"; textureMinMagFilters_ = GL_NEAREST; break; case libcamera::formats::SGBRG8: firstRed_.setX(0.0); firstRed_.setY(1.0); - vertexShaderFile_ = ":include/libcamera/internal/shaders/bayer_8.vert"; - fragmentShaderFile_ = ":include/libcamera/internal/shaders/bayer_8.frag"; + vertexShaderFile_ = ":include/libcamera/internal/shaders/bayer_unpacked.vert"; + fragmentShaderFile_ = ":include/libcamera/internal/shaders/bayer_unpacked.frag"; textureMinMagFilters_ = GL_NEAREST; break; case libcamera::formats::SGRBG8: firstRed_.setX(1.0); firstRed_.setY(0.0); - vertexShaderFile_ = ":include/libcamera/internal/shaders/bayer_8.vert"; - fragmentShaderFile_ = ":include/libcamera/internal/shaders/bayer_8.frag"; + vertexShaderFile_ = ":include/libcamera/internal/shaders/bayer_unpacked.vert"; + fragmentShaderFile_ = ":include/libcamera/internal/shaders/bayer_unpacked.frag"; textureMinMagFilters_ = GL_NEAREST; break; case libcamera::formats::SRGGB8: firstRed_.setX(0.0); firstRed_.setY(0.0); - vertexShaderFile_ = ":include/libcamera/internal/shaders/bayer_8.vert"; - fragmentShaderFile_ = ":include/libcamera/internal/shaders/bayer_8.frag"; + vertexShaderFile_ = ":include/libcamera/internal/shaders/bayer_unpacked.vert"; + fragmentShaderFile_ = ":include/libcamera/internal/shaders/bayer_unpacked.frag"; textureMinMagFilters_ = GL_NEAREST; break; case libcamera::formats::SBGGR10_CSI2P: