From patchwork Wed Jun 11 01:32:44 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: 23540 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 6255EC332A for ; Wed, 11 Jun 2025 01:34:43 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id F34AE68E01; Wed, 11 Jun 2025 03:34:42 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="EqqfoiM2"; dkim-atps=neutral Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8DE4B68DFF for ; Wed, 11 Jun 2025 03:34:39 +0200 (CEST) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4530921461aso26487835e9.0 for ; Tue, 10 Jun 2025 18:34:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749605679; x=1750210479; 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=zJCYQUQNddeKnCWxfHEDrxIHP9gpUnE73ekiVXEWSuY=; b=EqqfoiM2zINbqpG1wqxnQkSwrQWl8bpHJNO+3vgzCETke8XbIZ7iO8uv/upFl+aoyx GIi9TRIcyJ+GocgJ1FwogUxG9TDy7FvHXhynmbOuzZ/27RYNah1pp1kfiTjw52Nr9HON QtVVkhzmYihH7VEnxt+AbVnv3T8phWSVpGcGoItIdguIRSdTyxkiq6PJiVKWS544LgSy W/wOCPjwI8xlaLn/R5MWtWFbQDuzCcUwPkCVQXUO8qTYdfKJrhW6uxIv0tn/23gsfq7V Kr5wl84Cfzu0/OYOYCkQScz702ZBm4d/u36D4R2poMa+T/udcONy7bbC6nFB53nJMz8y AWbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749605679; x=1750210479; 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=zJCYQUQNddeKnCWxfHEDrxIHP9gpUnE73ekiVXEWSuY=; b=Xzk6qQwY1lyapDd2iOHsos8NCd/Fmx7kR6fSnC4EMslx8XW02jQ5xwqC4E0NtjFV40 2oknYdV2ElPA+KPz+CULbOvpXYIiMPUVFjjzDvSRniSJU3crPTgNWTa4mb7nJEeahknE PJI0x36UL4acjaEpPXviqFDTlQpV6YiF/PC9ojGeDfnVmwG9wVNn1Bc/NGmiSzo6ZOdI CuPZIF4SBvY0XMuEK/MygCWDKvOXZkczFbtPv+DgRmmmo8GpJWMqWi1F8oiQT87YEpOJ GH7P8xQBGQaWVNrb7Rd7/nfocF41mRohJP63UMQxPD1sROsVNAGiRs7NAk8jxxnD6DFl CZIA== X-Gm-Message-State: AOJu0Yzbf1iYlf9te1ihT0ANK7nAvs08JFSoh4WFk0LvIn/MRDou5eY3 ngu2FE+IPoJ+EZyx5gbZ05uMVXbKTFEXFos3nPaNoxiP6hE7Dh1/5qNHMICsw5IMt82ishQMI4t VrYMOqcM= X-Gm-Gg: ASbGncuLhATE+WwCI0DGNuGAzzTdDsK0JJtYhJZHjKvCpUJzaG3t+IFZVgHhVW+goy7 dIS792wQdGzewjz5iKOv7YwTTFgqTR5gjpo46ZaUwQMxMBzzg/QZz4yJr5HsDR7PW1jdOLJ3abX djc184Yixv68MwfNmU8r63jjAZkfqgFdYHOKZ4UWmSr3+kaYuY7fyOaeLBW8NmxNXG31nmVXv72 tl/RiDKZkEOe5g9OUhQ2qPO/K9P809wAuYXL583pRWCq7oZ4uM44yuSkzeBLAOs8Pz5dt0YDhsf anVqZA2HJ4HOv4io/rlgADVGycOkColvzPLpw44eMOS2Lq3TLffbUJ0m9RG0W85/HBZyQ59Zi40 SvM1TFrrRDgVPLdNqJC2pW68ngfr/bA4FikOL6hmvHA== X-Google-Smtp-Source: AGHT+IFeFZH+bOIAHxkzAGZj3/R5Su7LWc1dRTHOeF4q6cSRfXWXYY3/eHmaM6QFkoQ/hR+U9amG7w== X-Received: by 2002:a05:600c:154c:b0:43c:ec4c:25b4 with SMTP id 5b1f17b1804b1-453248b0ee1mr10811865e9.10.1749605678863; Tue, 10 Jun 2025 18:34:38 -0700 (PDT) Received: from inspiron14p-linux.ht.home (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4532514138asm5680625e9.3.2025.06.10.18.34.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 18:34:38 -0700 (PDT) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: Milan Zamazal , Bryan O'Donoghue Subject: [PATCH 34/35] libcamera: shaders: Rename bayer_8 to bayer_unpacked Date: Wed, 11 Jun 2025 02:32:44 +0100 Message-ID: <20250611013245.133785-35-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250611013245.133785-1-bryan.odonoghue@linaro.org> References: <20250611013245.133785-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: Bryan O'Donoghue --- .../{bayer_8.frag => bayer_unpacked.frag} | 0 .../{bayer_8.vert => bayer_unpacked.vert} | 0 .../libcamera/internal/shaders/meson.build | 4 ++-- src/apps/qcam/assets/shader/shaders.qrc | 4 ++-- src/apps/qcam/viewfinder_gl.cpp | 16 ++++++------- src/libcamera/software_isp/debayer_egl.cpp | 24 +++++++++---------- 6 files changed, 24 insertions(+), 24 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: diff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp index 71742d84..9ec96660 100644 --- a/src/libcamera/software_isp/debayer_egl.cpp +++ b/src/libcamera/software_isp/debayer_egl.cpp @@ -189,10 +189,10 @@ int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputForm case libcamera::formats::SGBRG8: case libcamera::formats::SGRBG8: case libcamera::formats::SRGGB8: - fragmentShaderData = bayer_8_frag; - fragmentShaderDataLen = bayer_8_frag_len; - vertexShaderData = bayer_8_vert; - vertexShaderDataLen = bayer_8_vert_len; + fragmentShaderData = bayer_unpacked_frag; + fragmentShaderDataLen = bayer_unpacked_frag_len; + vertexShaderData = bayer_unpacked_vert; + vertexShaderDataLen = bayer_unpacked_vert_len; break; case libcamera::formats::SBGGR10_CSI2P: case libcamera::formats::SGBRG10_CSI2P: @@ -200,10 +200,10 @@ int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputForm case libcamera::formats::SRGGB10_CSI2P: egl_.pushEnv(shaderEnv, "#define RAW10P"); if (BayerFormat::fromPixelFormat(inputFormat).packing == BayerFormat::Packing::None) { - fragmentShaderData = bayer_8_frag; - fragmentShaderDataLen = bayer_8_frag_len; - vertexShaderData = bayer_8_vert; - vertexShaderDataLen = bayer_8_vert_len; + fragmentShaderData = bayer_unpacked_frag; + fragmentShaderDataLen = bayer_unpacked_frag_len; + vertexShaderData = bayer_unpacked_vert; + vertexShaderDataLen = bayer_unpacked_vert_len; glFormat_ = GL_RG; bytesPerPixel_ = 2; } else { @@ -219,10 +219,10 @@ int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputForm case libcamera::formats::SRGGB12_CSI2P: egl_.pushEnv(shaderEnv, "#define RAW12P"); if (BayerFormat::fromPixelFormat(inputFormat).packing == BayerFormat::Packing::None) { - fragmentShaderData = bayer_8_frag; - fragmentShaderDataLen = bayer_8_frag_len; - vertexShaderData = bayer_8_vert; - vertexShaderDataLen = bayer_8_vert_len; + fragmentShaderData = bayer_unpacked_frag; + fragmentShaderDataLen = bayer_unpacked_frag_len; + vertexShaderData = bayer_unpacked_vert; + vertexShaderDataLen = bayer_unpacked_vert_len; glFormat_ = GL_RG; bytesPerPixel_ = 2; } else {