From patchwork Tue Jan 6 17:00:35 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 25653 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 0F437BDCC0 for ; Tue, 6 Jan 2026 17:01:05 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9376561FB7; Tue, 6 Jan 2026 18:01:04 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="nXxwiUVT"; dkim-atps=neutral Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id EA53B61F9F for ; Tue, 6 Jan 2026 18:01:02 +0100 (CET) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-42e2e3c0dccso570327f8f.2 for ; Tue, 06 Jan 2026 09:01:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1767718862; x=1768323662; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2Equy1XW3S3UbMzJUWtUkNKLn0Pv3VLkUxIvtVo8/i0=; b=nXxwiUVT6dxizaQcb1sV6oAOwptEFAgUjUM2r6gIxzxmUdIZsgQDVQVhLai2dVgm6L QuYbBOsmkFHinNTe5XbkqmWudn8plOz+ybyJhAfR+excLEYRePclOU7M5Hw8vIU9cEgn 2zi4p4l+6d3NWtojrRhDoiJKqsoO6UV69OivSGnAbXy6gu1X5fYNP/WHyt9LJvYzURuc Cd35Ox4pWwn15+hyXshMU3xqXLfRIrybGqdqIIIeF9HueBtIQXGt5uduzxzIl3Aty1Gp 49DK4x4b0ZRxKd822GEe9bT0/keYyuYgh9loSoGDbjE4qqXZQj98whb3+HkbnYXPosHR Wb8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767718862; x=1768323662; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=2Equy1XW3S3UbMzJUWtUkNKLn0Pv3VLkUxIvtVo8/i0=; b=FyNIav5OsHJz88U9dxfXHxNybdhSvikM7FbVA+K3ol/KBUIcFPQU2HpCAg1w+MFZXa MlIaSdHe4AIN+0GLsefa+nCEtEqHFfnbU2j/pwz9uFG2eMsZnJlGp5yuQfWSg2wx3b2h IVW0C8Iddu5MhvK/wUYLECfEQ2eY3sk2OYMFmmKEpC/qRId859wCtm5JJf85SjdYJ6Ww 4yriMApqdhDmHybxF2CNyyemGVHuolPx6t46lc5VNhedbuoo0Rcy5n1nwL5UcTL0QqTg 94mjCjkGwfwYtvNObij12MP1d9LRvauOu5MA14dMcq+vAHVpyb4WBgtP7DKC+ga9QAk4 7YHQ== X-Gm-Message-State: AOJu0YzT80LvO/sIKK12u+4Zh1exf2bL+JbvNrtvGPdO1z5l38oEDIP0 nnD2QI2vkcaW2TuC792G2iZXx/pNB3mTMyIgjWtCvgsub4OVBwu0hAgXJeCL1FBaoQrrQSzg0Mg uj4KpjCw= X-Gm-Gg: AY/fxX6yCKGDNufoYk+EYzetCbsC8zGBZV4UQ7BSgGT89WoKulq/DBkUb5GmqiSNv/u gYih/YsmwMpKmzFXF9gVZuvXDT/9mTeaWa5A3/xRVcldbsjpmI2/y410OjEJwvGBR33I43T1VPL BKHaKrm/GqNB6X7rWp24e8tfzaL0NgkNhzcWnBjYX3xAHKhlY64QpLkCWXT6udSm4eZtthGqRAL SA+jgrncqRdsjR8A/ryTgpK5Z+3c2dsLInsGNawuz5gwnCkxcuZPRK2pHQsEOpEouZlbCiRU1Aq 2AN19J5YovFciNibEzwlhyCELSfhZ6bGQLqAB1cEmbktHR5n/pjYed0EzjPd2oSrZs0jOAroR0o MU6XP68q55txNiemgZqubjVkfM3C74uqiXckhHDAyTZ6/5txyQsplIIJALus9uL91YzYWAyY/ea ZbX6D36a3ojbeD147CdvzDeaVnyMFDSTAqEMpDIkCYBlxKfJNqilEaE6Lan/tdW3i4+0I= X-Google-Smtp-Source: AGHT+IHkcof6BxUiUtL6VBZXcup5dI5pzHd5Pj3brWZtX2+j5iwfvBs4eutbuBUabvhwojAXgbWyQQ== X-Received: by 2002:a05:6000:2383:b0:432:aad5:320b with SMTP id ffacd0b85a97d-432bc9d0e65mr5211844f8f.23.1767718862094; Tue, 06 Jan 2026 09:01:02 -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-432bd0dadcfsm5515322f8f.3.2026.01.06.09.01.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jan 2026 09:01:01 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue Subject: [PATCH v10 00/24] Add GLES 2.0 GPUISP to libcamera Date: Tue, 6 Jan 2026 17:00:35 +0000 Message-ID: <20260106170059.56193-1-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 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" v11: - Rebases on today's tip of tree - Applies Tested-by from Hans - Applies RB from Robert and Milan - Fixes ~ every issue Barnabas raised in previous cycles with exception of: a. Header checks for GBM and gles are required in at least one of the ci checks respectively b. programId_ removal happens in stop() not in destructor Full testable branch Link: https://gitlab.freedesktop.org/camera/libcamera-softisp/-/tree/0.6.0-gpuisp-v11-a?ref_type=heads v10: - Drop selfEnumerating Ccm object - libcamera-softisp meeting agreement - Switch on uncalibrated yaml CCM @ 65k by default - softisp meeting agreement - Pass contrastExp from lut into shaders instead of calculating contrastExp for each pixel as @ v9 - softisp meeting agreement - Adds in RB as indicated by Milan and Robert - Fixes check of unique_ptr - Barnabas @ v8 review v9: - Rebase on 0.6.0-tip including precursor now merged _______ | YAY! | |_______| ||| /|||\ / ||| \ / ||| \ | / \ / \ - Number of fixes from the formatter now that I'm aware of its existence/use - Bryan/Milan - Includes Robert's changes for the projection matrix - Fixes the case where the uncalibrated.yaml file is enabled. Iterates through list of loaded algorithms matching Ccm. - Milan/Bryan Bryan O'Donoghue (21): libcamera: software_isp: debayer: Latch contrastExp not contrast to debayer parameters libcamera: software_isp: gbm: Add a GBM helper class for GPU surface access libcamera: software_isp: egl: Add a eGL base helper class qcam: viewfinder_gl: Set no-op Bayer shader values libcamera: shaders: Use highp not mediump for float precision libcamera: shaders: Extend debayer shaders to apply CCM gains libcamera: shaders: Extend bayer shaders to support swapping R and B on output libcamera: shaders: Add support for black level compensation libcamera: shaders: Add support for Gamma libcamera: shaders: Add support for contrast libcamera: software_isp: Add member variables to track selected input/output pixelFormat libcamera: software_isp: Add a Size_ member variable to pass to eGL later libcamera: software_isp: debayer_egl: Add an eGL Debayer class libcamera: software_isp: debayer_cpu: Make getInputConfig and getOutputConfig static libcamera: software_isp: debayer_egl: Make DebayerEGL an environment option ipa: simple: Add a flag to indicate gpuIspEnabled libcamera: software_isp: lut: Skip calculation lookup tables if gpuIspEnabled is true libcamera: software_isp: lut: Change default Gamma to 1.0/2.2 libcamera: software_isp: Switch on default CCM at 65k libcamera: software_isp: debayer_egl: Make gpuisp default softisp mode libcamera: software_isp: Add a gpuisp todo list Hans de Goede (1): libcamera: shaders: Fix input sampling when width != stride Milan Zamazal (2): libcamera: shaders: Rename bayer_8 to bayer_unpacked libcamera: software_isp: GPU support for unpacked 10/12-bit formats include/libcamera/internal/egl.h | 152 ++++ include/libcamera/internal/gbm.h | 55 ++ include/libcamera/internal/meson.build | 2 + .../internal/software_isp/debayer_params.h | 2 +- include/libcamera/ipa/soft.mojom | 3 +- src/apps/qcam/assets/shader/shaders.qrc | 4 +- src/apps/qcam/viewfinder_gl.cpp | 42 +- src/apps/qcam/viewfinder_gl.h | 12 + src/ipa/simple/algorithms/lut.cpp | 78 ++- src/ipa/simple/data/uncalibrated.yaml | 12 +- src/ipa/simple/ipa_context.h | 2 + src/ipa/simple/soft_simple.cpp | 3 + src/libcamera/egl.cpp | 608 ++++++++++++++++ src/libcamera/gbm.cpp | 107 +++ src/libcamera/meson.build | 33 + src/libcamera/shaders/RGB.frag | 2 +- src/libcamera/shaders/YUV_2_planes.frag | 2 +- src/libcamera/shaders/YUV_3_planes.frag | 2 +- src/libcamera/shaders/YUV_packed.frag | 2 +- src/libcamera/shaders/bayer_1x_packed.frag | 77 ++- .../{bayer_8.frag => bayer_unpacked.frag} | 92 ++- .../{bayer_8.vert => bayer_unpacked.vert} | 6 +- src/libcamera/shaders/meson.build | 4 +- src/libcamera/software_isp/debayer.cpp | 17 +- src/libcamera/software_isp/debayer.h | 3 + src/libcamera/software_isp/debayer_cpu.h | 4 +- src/libcamera/software_isp/debayer_egl.cpp | 651 ++++++++++++++++++ src/libcamera/software_isp/debayer_egl.h | 124 ++++ src/libcamera/software_isp/gpuisp-todo.txt | 40 ++ src/libcamera/software_isp/meson.build | 8 + src/libcamera/software_isp/software_isp.cpp | 28 +- 31 files changed, 2106 insertions(+), 71 deletions(-) create mode 100644 include/libcamera/internal/egl.h create mode 100644 include/libcamera/internal/gbm.h create mode 100644 src/libcamera/egl.cpp create mode 100644 src/libcamera/gbm.cpp rename src/libcamera/shaders/{bayer_8.frag => bayer_unpacked.frag} (53%) rename src/libcamera/shaders/{bayer_8.vert => bayer_unpacked.vert} (90%) create mode 100644 src/libcamera/software_isp/debayer_egl.cpp create mode 100644 src/libcamera/software_isp/debayer_egl.h create mode 100644 src/libcamera/software_isp/gpuisp-todo.txt Tested-by: Robert Mader