From patchwork Fri Dec 12 00:29:15 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: 25519 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 4B7ACBD1F1 for ; Fri, 12 Dec 2025 00:33:38 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0158F61635; Fri, 12 Dec 2025 01:33:38 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="nsYbYvld"; dkim-atps=neutral Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3258661613 for ; Fri, 12 Dec 2025 01:33:36 +0100 (CET) Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-7f216280242so215865b3a.1 for ; Thu, 11 Dec 2025 16:33:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765499615; x=1766104415; 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=nsYbYvldMMkS4h+VoJ+thPz9kyICIq1qx0mT5jxyVNbdfWuM2Xmldzdd9vucK8Hpzu Lp8+/88SVV1FaPXVsJVxoY40qfyR9WVzKlsMQId7siPn2ewuzO/y2zjVd7xf3WLVJTPG 41d4O/a9y9Q69eNlEa2/uUw4LRYW9sI/daj1mSbfz4yyviMQaOUKpOmBrQuU3yjQEtWV OioAuT4MIvTQ7d0ULuvRPJ1Kpv7Yi1RcDyonKRFffrRY006Gsbu8iU/THCFLM20HfGLm fdfsNagCN6MboyqW7RD1yT9WloRi+ywrD/ZQ6Ej8KOBIX5HMausuOs4WTmeiaatJLp4f h3bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765499615; x=1766104415; 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=Z/gLx19lcfislLSGQmQY2JqfXOUv9ghDUS5Qem499RZrYKVkjNuDzrY+kJAD+Umyej 6+rROoZBUIppUaf3RJuKPe049xM4ltNYRWe22ogYpRt05jWDPQEsX8vDpyiXtYYKWycD Hge5dej8j+nNat9IjDXACfAyuIs8bsvaF+l2P3wrrQ/suo6L6rL0m3o19xrplgayxOPn aK9V/g2XNWTatGugy53WbMj7Kb2ZQ4PLc3tT3qiSv02Y0pZBZ6QPg2YqOhc6A8hXdyJk 0nreF4hDdg0yp6JT+d9+6/WhAmim2edWcD+AUfcPalbCBebFxHFmjyvAG3Q8c15acEgR kKhw== X-Gm-Message-State: AOJu0YwtuUvzvzyWtRyPbozCiLixmex/7FZUq4C3oTcarlFBRE4fh1Cg gxH6XqZZ8YWeYcccgTIPb1U/lv839ElONcCagMUUmEyM1dWJpeOe5tvbLTp48VJNKm92oG3rjY2 lnNpH X-Gm-Gg: AY/fxX4cpRiH2eJx0hr45fvJhXwtcXS80xAUWiYuH7zWT6wyRP4ySrRAyOP3CHkp4Ry qL9kOgR+IFFqIKnmZj/5vet0i7bgcNiiltEkGAoJmsjgJIuYNDDm3W8C/Tsxjl8KzXBUZ534+LJ 9iZ/ssNCOFMvJZrcQ5Ol2eiFm8tJfFoiuaRDX2yqmqVOnZw9FwTCsjLxrSrl0MvPlCNbDIDl+y7 BoZUWsnrHj8eU+ZlPqQs1e5ccgL6oMJrRRuCC+5MtUQKL5D3cNaMh05IADmb9aqKd5iOKFRG26c 7ABadLOoxV6woaE8YlIw9h2X2aRUH11j8YmCVUav3PSq7ullUj+5fW5laXilmTF261vpN7GZl92 2wbMW8ASoK+QF4k+hdbLnX8iaUp+SmOQzyv5A5dw5gtIJz5wireg8IqYtk2U2WkIM9E1sUzT8R/ dDQlFTODzeRL3P/CiiKGYidbwoI8lPXdl1N/LAOk5rDVAm+b25oNaSNWziOjI= X-Google-Smtp-Source: AGHT+IHUxIgzmVQQrJLQx1HGJTExHGTJFwcPhomuKaqCm56WYyHlnat7ucD7MKX/C0ctUKiHUlIeRg== X-Received: by 2002:a05:6a20:a123:b0:366:14b0:4afb with SMTP id adf61e73a8af0-368599a8d0bmr4775356637.34.1765499614489; Thu, 11 Dec 2025 16:33:34 -0800 (PST) Received: from inspiron14p-linux (p99250-ipoefx.ipoe.ocn.ne.jp. [153.246.134.249]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c0c26eb0f6bsm3317282a12.14.2025.12.11.16.33.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Dec 2025 16:33:33 -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 v8 04/26] libcamera: shaders: Rename bayer_8 to bayer_unpacked Date: Fri, 12 Dec 2025 00:29:15 +0000 Message-ID: <20251212002937.3118-5-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251212002937.3118-1-bryan.odonoghue@linaro.org> References: <20251212002937.3118-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', ])