From patchwork Wed Dec 10 00:53:32 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: 25421 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 37204C3257 for ; Wed, 10 Dec 2025 00:54:30 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E745D61438; Wed, 10 Dec 2025 01:54:29 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="KcfVW8Cr"; dkim-atps=neutral Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 244486142A for ; Wed, 10 Dec 2025 01:54:28 +0100 (CET) Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-7b22ffa2a88so6325164b3a.1 for ; Tue, 09 Dec 2025 16:54:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765328066; x=1765932866; 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=lV+JLx0+P4aigKpifcEHa5VvxL7Qodjjb3+3JXtFVoo=; b=KcfVW8Cr9UwoPV+/tSjMEEl+oghMGsa1mYh4MT6wp5ETKUN+0nc7DD5GLCHzJu9gXa 9iVhHMY12ZqyBAXDvIn6VaLmjgfEd57KdVLn/ZqNADpIz474lyyAdJCK4Tg8zdCHe/ad yic5IuMwnq4Jwl90oaFVOTSNdNh58VOemyqwLGgPrz1pAyBCQ64m4N64cVneAwLYl5Xh UYr5XBdhTrA/gNgw3fHJ2PdhAiQGePVx+b+wWfCoVjthlQNOdVCheM2Zt5DYDtHhhY76 8d2KN1hNpRMba4aKbNWrlignpS9dJy/5fQStYSNjOvDEyMY653TC/d7DMli0RZ9E4CvP Mhfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765328066; x=1765932866; 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=lV+JLx0+P4aigKpifcEHa5VvxL7Qodjjb3+3JXtFVoo=; b=R1ol3augjwsPaMLKJ1OSEQE3qIfeWcRxdk+QorvjCNspkQOPy3BalPz/Bk0u7UaJSU 1YHhYbx8T25Acrvr8Sdg0tMF79/aTZnayC9SLGQUle/Cft1yN3A0WX7cmNLCXZJHlZg2 NAiqmhoXSo+rCE1PXw6ge2YlWrHvimVGXExpTnIBwOXzr2qNOP6B3iA7oMfqsCPeJuBk Jk1ItTO0tGiE7R+Wm8g+t9KFXZQLt/4UMMgLEXr5vPaaGv9c/4ZsKbtoflixLl1zeSaB +ZhPK/Bjho9jZuWThdWrH+QfwY9kKPOPWdv12aZuNljsk+43o4GrwHUuTxf/EAN+onA0 mveg== X-Gm-Message-State: AOJu0YxlXlRb97N9YumKpOgpST2OEeHDDgsfkvMoLTQX1XC4OlCMWwkt RQVp4prF85LELZXXXJ4tL7r2O0G5WDh81euMU0eFNvw7X1Bwg773Z/Mh+o9rmo7wAzj7v7JwqBV 7Dd15 X-Gm-Gg: ASbGncukLrF4maFU8Pe5nvlg6r3LJU59JzSPD0vlTRhY4HOdMAmmzxFBI7qS2S/iCct r5DXJ9ejWgblXkRU0gUc9/K3vo3oTX1XJQ7EtMSHiUFXeE0JfD+sETTgIYJD0kmsfOROyfeWKXC pg+t9VFmKvZplhqGEQkzLYaZv4krr8hyTafWGbhO8vEiqYTyEic8PkA5x3SaZ+S069w3T8hPzZg dbt2ZNgwm4zeJChlF/Jq9Goa5sAa7Ywp0a3eExMFDj0QkcMNuBUh6GKu17XoSwN+wLsoBo4Z8w+ Sj/3ywIctvKj5oWFOflYGC3WGe/AIIAO0YOnBGfd1/RQAiAXLwWMB+2+l5Ae25Iek29jSPtqkGq K8/mwUhDhGCYUxLXSpF0ii+RO9w8MI2eEQ8TnPHGx3fwCsiYWUZKwsGwVpAOEdcPBosykmCLIM8 WZEL19JLLoHOMlymIlcU5akUchdYOZn/5NAThndGHCcrp6XKV6FXBi4Q8clhEVYYwf X-Google-Smtp-Source: AGHT+IEa+ThqQkEne0bq4bINYcuOZi8k6mk5ZdK3wn+AxSfy2oHT/hMChGX7KSXEXw5T33F6/C6ZIQ== X-Received: by 2002:a05:6a20:748e:b0:366:14ac:8c76 with SMTP id adf61e73a8af0-366e288a36fmr583660637.76.1765328066455; Tue, 09 Dec 2025 16:54:26 -0800 (PST) Received: from inspiron14p-linux (p96936b06.osaknt01.ap.so-net.ne.jp. [150.147.107.6]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-bf6875cc8eesm16057762a12.16.2025.12.09.16.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Dec 2025 16:54:26 -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 v7 04/26] libcamera: shaders: Rename bayer_8 to bayer_unpacked Date: Wed, 10 Dec 2025 00:53:32 +0000 Message-ID: <20251210005354.44726-5-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251210005354.44726-1-bryan.odonoghue@linaro.org> References: <20251210005354.44726-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 69b7c6e59..ea957dc65 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', ])