From patchwork Wed Oct 15 01:22:39 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: 24672 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 1497BC3331 for ; Wed, 15 Oct 2025 01:23:38 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 93FAD6063E; Wed, 15 Oct 2025 03:23:37 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="cAghXbyb"; dkim-atps=neutral Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D929560646 for ; Wed, 15 Oct 2025 03:23:22 +0200 (CEST) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-b5a8184144dso331942966b.1 for ; Tue, 14 Oct 2025 18:23:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760491402; x=1761096202; 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=cRVEHiEipQ6SvLkbWQz7JxYpu6YoVwpwlf26Fgb4Ok4=; b=cAghXbybVOjiARJYDXzLUK6HhgyfEaNPl79RTMyYQD48RqCy+Ban5QAYE6DL3gtzef XWBUoNnHO8441OyVnEZqjFbGvWiLwRGfXoRruEZFSpIapvzoJ8Iv8YtiP0Zn9eBhUkmU /Ag3je40QueVMg07Y47M9n89YMcthKWsiDUGh72vzm5IKEF3KxNU4v66mWEkGf5on5L3 c40zOdRSmC2lTCT/e89TbCwYphyxa84iQyUehq+5hWy9bG81R3TWhlZw7gy2zSV5Wc7K vNoa4oQtIGeFpJyFro+NIebBWT0/Hp1jlcSw87CZb9A0EWwtgVMRA3GjypjcA/vGohJv 4K/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760491402; x=1761096202; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cRVEHiEipQ6SvLkbWQz7JxYpu6YoVwpwlf26Fgb4Ok4=; b=tNejZXNqsEjukjDOACOgipKR0GxfQOdmr7vK08WIpaiPPvLg5Y3GOebB1k59jz+lzs k47HEGKfDz3vPffhqgL9ZXXlAdht6xdaJPuXpgVxBh+9B+J8qsvK/gMncMcY/M+NYLZ/ xVZX/Mu1PtCzHBsL75Yg0/WWrp7m38pj6i+4AQTIqIBrlkGznEUYDWZqa0CEcEmHxNgn 9QcBJMBkl1SM25ku93vMnjmRBbATUKDUFkb6FSvXorZLmKyDZxMyTh91ZnIARZoPuqdq EhTD8kU0uSAx8DYPAL239P4FbUGFyNQFbyRuqrFukkI8xEyXfQgAMf/IuSivT9fr6xmZ AoFQ== X-Gm-Message-State: AOJu0Ywx2B8DW38EKTYkxC6+688fvcH+DxoDg7mHjIG3xCWl5a7/nbBj 80PmmVdIffwlyDrEJJA2rhJDJuEavjiWUEzYN6YmQ2mWfTl/cxth7XVpQNE1yFMBCv3VNsXGrEn 3VjYp X-Gm-Gg: ASbGnctaHZz+ffyT73/3JK0j+FOXZdMsxB8ksgmXgabJ4ulxm/5kM2lyDlP8ce2rpRg jFUBo/yFJ8JHVUB7D3xes5EmDic2h5QfrL/ph5D/Fh3VsE8WvEsYM/nJj8NEK2+8rNq8DVU3shz dfWPILA6+CNgA8XDihm2jLYmv1gO5Q/BSCLTUKxgdM5AW27TeoDYToqL1nhynL/NdT5Dsj7AjrF CD6dP/zouQF566SxSkyVloIRnR2JlJaZqW2Btd3s+jfrkvZMyfp6I0fqzZMDT8+TyDPXdE2BmmP Piy3xe7rWHl82jdJiUpbmgFQd8QVc7Cwzf1TTN+EdI0FmME3y5SOnGYeHugJllN2BTS8qBFmnzg bx9a9hygrxh482v8DhK9BLabUfqFI1ZwYu8xo9Vaj0sg7uz+EkTfhl5NZOczYZ4LkynYgKao46D 46jNbG97RwI7FwYuERLYstVeESQybtew== X-Google-Smtp-Source: AGHT+IEBfgYNNf/Ho6kVraoSYcIxbAZ4znSAoOR5FV3Ef+EGq1LYYlpP143JvZ1qE8RNV6+TEZaZtw== X-Received: by 2002:a17:907:6d25:b0:b40:52:19c2 with SMTP id a640c23a62f3a-b50aaa9c937mr2825866366b.20.1760491402094; Tue, 14 Oct 2025 18:23:22 -0700 (PDT) Received: from inspiron14p-linux.nxsw.local (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b5ccd7b202dsm98348466b.82.2025.10.14.18.23.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 18:23:21 -0700 (PDT) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: hdegoede@redhat.com, mzamazal@redhat.com, bryan.odonoghue@linaro.org, bod.linux@nxsw.ie Subject: [PATCH v3 27/39] libcamera: shaders: Rename bayer_8 to bayer_unpacked Date: Wed, 15 Oct 2025 02:22:39 +0100 Message-ID: <20251015012251.17508-28-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015012251.17508-1-bryan.odonoghue@linaro.org> References: <20251015012251.17508-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 Signed-off-by: Bryan O'Donoghue Reviewed-by: Kieran Bingham --- .../{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 386b342d..dd441a57 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 04f9d706..32dfa51b 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 70f60065..95965ab7 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: