From patchwork Wed Oct 15 01:22: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: 24648 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 66E26BF415 for ; Wed, 15 Oct 2025 01:23:03 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id EBE246061B; Wed, 15 Oct 2025 03:23:02 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="McnJEI2Q"; dkim-atps=neutral Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id EA68260612 for ; Wed, 15 Oct 2025 03:22:58 +0200 (CEST) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-b3e7cc84b82so1125051866b.0 for ; Tue, 14 Oct 2025 18:22:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760491378; x=1761096178; 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=q2bD5pT1oq/3EFruAOUxznBdV/GzEfzx1ttQIm2/ez4=; b=McnJEI2QrmkAmvUxEaA5VvRkrt/iOWl4iTDV3Mr38fz4klcVMjIxX8E+92j5TEiwnH vgtFAfwSuR1TcsJQbMj/p2g6MbyVUsUhB3z2ySoU5+k0API3v5k1nU7xZtmGVsjTUcBk 3JLXoCZIKql3eQcAVXKaOYRNmT3ICpjL64VNPdMcMTIX/IG994ICVpr4g+JTVw2Gv2zQ r4LRUi6hI1/h4PfqAT9YZMPE0PIUZrkQK+su5t07QiPIMEoWwPKU+I0e/Pe6APHGaXoG tj73u/wnrAl2gv5dD+8LRSLDRtTwIB6Brg1YXLz5CMQ/FPRshHec42rASKCzAZpjULST wcGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760491378; x=1761096178; 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=q2bD5pT1oq/3EFruAOUxznBdV/GzEfzx1ttQIm2/ez4=; b=KG94euhjcVHGlBPgCMQA4pZq7aByHKFBqbAR/Mid0DGhaGitghcjs8n1UjhhFXDn4y O8LA7i7+WsR7yM6zEDzDHaGAmu3BCYufcbfr2ZdDK+UMFynvElzJxpmyVjja3crsBsmk r4CbTQhM+Iv5WzMcNzuoLtPov8KyCST5TkZZfSerMqsUp/hlUJsPvEB17mt27i3Sup27 Ao03wgAuVmc4foTD0fKbD9yN2u/scAaEwqjPahAB8UpmBtb9YCVUrFvPB7ztT3KMKghc vU6qCXR15mex0xO3A1/5V9YE/IQj/POpeSvxXpzCtv+7MyhfpnkPqM+DrrOtpzY7/tmt gnRw== X-Gm-Message-State: AOJu0Ywf8ODuGbAHimL90HfujDwNCGpMiGShdN58QsbjGcg+1R8DWxNL vJjGxbdlH+vVxt6Hsn2c0m09Wpw0lijYmIugVFIViDQEdTOM5WjhhXKC0Kq8cOuXzIXfqAlyvf9 RWiNz X-Gm-Gg: ASbGncsM+CjmJZKF+J5gZQcLWiCghTXNchTqjrSXSMoWBJMkbdN3nFXkPtoTEwnzqrI XZJ2roH94DAWynTObt9YOj3d5fjChBbW9GhSV/5Lqhk4vrb/j6igW8Mn0EU3KgEIbJuQ1BrW6vg zLhYQRM98asEo+Yl3qdFP/inByuc7sZ/eL2W9odmUsstzUhfHVcD89d0HIsVtvkV/+VjXgAbx0T GTvSY3CaqwssQ2gbEZ5f0s1TFcc5gAIQfRAi5xYd/C9zSle7GNAylwLJARJnUCgBFesJl+tHq9f iM7aeUNX7U60SBZZAi90NN2GfRngbGV87xO9h6ku1CJLQzCpjuYijMdPtLkRzbOH0Bmk1kUCIrC 3qqXgMygFwTpMdrh+FkzzkXzec/C80Q1JlFb+cQhoMW+mBm7WGN1ORg3x7wRnJOXVd0khoA8/Ra 30Q0nHVBaAIvXlwCR7ux4cJT1Bk0Sk58YmRhPF1Eo4 X-Google-Smtp-Source: AGHT+IFZz5lJd6euy3TnflC5ZVAEsQhnCfBC97wYwlXekMmDxhI9I5S/w44ec74+B/bTRLXKUbJbAg== X-Received: by 2002:a17:907:7f93:b0:b04:b446:355 with SMTP id a640c23a62f3a-b50aca01315mr2754993666b.59.1760491377773; Tue, 14 Oct 2025 18:22:57 -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.22.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 18:22:57 -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 03/39] meson: Automatically generate glsl_shaders.h from specified shader programs Date: Wed, 15 Oct 2025 02:22:15 +0100 Message-ID: <20251015012251.17508-4-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" Encode the bayer shader files into a header as part of the build process. Qcam already compiles the shader files down into a QT resource file which it references internally. In order to share the debayering shader programs outside of qcam create a generic header which both qcam and libcamera can operate from. Signed-off-by: Bryan O'Donoghue Acked-by: Kieran Bingham --- include/libcamera/internal/meson.build | 10 ++++++++++ include/libcamera/internal/shaders/meson.build | 10 ++++++++++ utils/meson.build | 2 ++ 3 files changed, 22 insertions(+) create mode 100644 include/libcamera/internal/shaders/meson.build diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build index 45c299f6..ecb7c9fa 100644 --- a/include/libcamera/internal/meson.build +++ b/include/libcamera/internal/meson.build @@ -1,6 +1,7 @@ # SPDX-License-Identifier: CC0-1.0 subdir('tracepoints') +subdir('shaders') libcamera_internal_headers = files([ 'bayer_format.h', @@ -59,5 +60,14 @@ tracepoints_h = custom_target( libcamera_internal_headers += tracepoints_h +libcamera_shader_headers = custom_target( + 'gen-shader-headers', + input : [shader_files], + output : 'glsl_shaders.h', + command : [gen_shader_headers, meson.project_source_root(), meson.project_build_root(), '@OUTPUT@', '@INPUT@'], +) + +libcamera_internal_headers += libcamera_shader_headers + subdir('converter') subdir('software_isp') diff --git a/include/libcamera/internal/shaders/meson.build b/include/libcamera/internal/shaders/meson.build new file mode 100644 index 00000000..386b342d --- /dev/null +++ b/include/libcamera/internal/shaders/meson.build @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: CC0-1.0 + +# List of shader files to convert to header hex +# for the purposes of inclusion in OpenGL debayering +shader_files = files([ + 'bayer_1x_packed.frag', + 'bayer_8.frag', + 'bayer_8.vert', + 'identity.vert', +]) diff --git a/utils/meson.build b/utils/meson.build index 95d657ac..3deed8ad 100644 --- a/utils/meson.build +++ b/utils/meson.build @@ -3,5 +3,7 @@ subdir('codegen') subdir('ipu3') +gen_shader_headers = files('gen-shader-headers.sh') + ## Module signing gen_ipa_priv_key = files('gen-ipa-priv-key.sh')