From patchwork Thu Nov 20 23:33:28 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: 25128 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 38DC9C3333 for ; Thu, 20 Nov 2025 23:34:03 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id EC98660A8B; Fri, 21 Nov 2025 00:34:02 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="MYCAeMtQ"; dkim-atps=neutral Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 61381609DE for ; Fri, 21 Nov 2025 00:34:01 +0100 (CET) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-42b3c965ca9so842991f8f.1 for ; Thu, 20 Nov 2025 15:34:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763681641; x=1764286441; 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=aOWsQHS70g1fB8m4fPc/5abKue0LOycI9h8pUVaouv4=; b=MYCAeMtQ/NQqFDetGG6BSXr4mFesc4MtHS7bEtD11vFrNwAzKB63qJtGJGs+zmYz/R is90A+XW3DIEqy6oaizX3ol0jUgIlS3HOxGW1ZjLZtVd2U8xZEQs3AlTWfLiUHitfZef 045uqBgHJY+SAsm5bCsXnw6nvMgljdOdCG1xByiVQlHwEzLpFQglO8lTQAoLwrARRf5j JH+JL+Lzek5QpuGuNQIJvHh2//3sYOv0Gnn6dtFLhFoInoh/8IuzGhMtGFQlk+aYnewC xWVjirs6YNHu/qwAQnDwYG9BXa2XpEEP1JmCn8A2uFE8ZKKta5qUyvVT4xYrix3ZTA1b 76Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763681641; x=1764286441; 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=aOWsQHS70g1fB8m4fPc/5abKue0LOycI9h8pUVaouv4=; b=qVhPyT1kxT7DVxZYAMdBOsWhiMumLaDFYwpGtPaaq0FJOznDdWLrZz4JbiptLzvi9Q EVYAYRpBy/eeZw4yl2Thr/z+HG7RCPZZKRkmuCMqX1Lkfgv/aLPpoKEQfZQVa9cLMcMG 96uM1USA88zW5QI7WAkkfj9YQC3Te6JVz6UlLV+P5XGYPM19mJ7gANDgDnpqqPCmuJT3 7zfbQEaBPQWNjpTks791qlJOL4/q0aNFa2R0YSaPDjvV3dmu+gzFP4IJoSGql/6ymD7o fC6YDEhNf42u+rmAIzjljBaauj7msV/l1CGvaFduWYKdL6QXdvc0VRuf5/Kg9CehD1Z0 fcTA== X-Gm-Message-State: AOJu0YwRctssXMnjD2hBdLxwpfZIzu5cETVQB/C1plmvIgtXploaXAvQ yT3bxZqcoZuMRUvx5Jn2kdu8XbQBH8erQ8N5n/phuhmytb2lf2roQFMvO23nQmvoP1Tu4x/TmZY iVfHz6kM= X-Gm-Gg: ASbGncujbA1JEypQbl9BYNoGAwQozSFnxisfrUgCrq4DjJJ7PzjPO5eUWHIxgsJJjMm eUUT7K6JqmjtJSapTmIujGz2Aghd/tHTHwmw6b/IX0NdPzBUml2fnrEmx1VuqY5tV97VlHh2O0A 92BolLcdZNmPlOi2eJDJhiOE9vCkszcYzMzApXqjCTaNgOvB+wYOOvQZm1Jg+zS1Vf3BbnX4LvI PJDUiiQ3F4eEpvRjH+ikmDU3ndcu9MQNeludahakIVkAm3XVbS+Mh+rVI465z0GjI/JcEnaaOPC xSWhoLY3n5fvsbE3RCW1+mkdzqzT9bCuyrAev1UweZAdQL0Gl4vBruMUmK2EP4u/iea+xl1zHSQ fhOzxb8UwbF5p7AXx09Sw++f3GWtOUK6vorxl81rOR8VsgV8U6gVOcF7ao6c6c+ToFa7ISND1HH 9qitluHu+Gop/FHevMxffV8oz8C5ieoTqkA8wVagRE7XCI1d2YEGezL7k+ZFMHu9q+nko= X-Google-Smtp-Source: AGHT+IH+RXn1P/aXsympVnstSWgpDaGfODJMfhpIUkNEszSe0On9EzAZYrqGWGHJYdldvCAuxTaTtA== X-Received: by 2002:a05:6000:2489:b0:427:854:770 with SMTP id ffacd0b85a97d-42cc1d35781mr98446f8f.43.1763681640654; Thu, 20 Nov 2025 15:34:00 -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 ffacd0b85a97d-42cb7fa3a81sm7984139f8f.26.2025.11.20.15.33.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 15:33:59 -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 v4 04/23] libcamera: shaders: Rename bayer_8 to bayer_unpacked Date: Thu, 20 Nov 2025 23:33:28 +0000 Message-ID: <20251120233347.5046-5-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251120233347.5046-1-bryan.odonoghue@linaro.org> References: <20251120233347.5046-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 --- .../{bayer_8.frag => bayer_unpacked.frag} | 0 .../{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(-) rename include/libcamera/internal/shaders/{bayer_8.frag => bayer_unpacked.frag} (100%) rename include/libcamera/internal/shaders/{bayer_8.vert => bayer_unpacked.vert} (100%) 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 386b342d0..dd441a577 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 04f9d7061..32dfa51bf 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 70f600650..95965ab71 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: