From patchwork Thu Nov 27 02:22:35 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: 25217 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 E3BA6C32DE for ; Thu, 27 Nov 2025 02:23:14 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 18AE360AA6; Thu, 27 Nov 2025 03:23:14 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="bmSd9sPi"; dkim-atps=neutral Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 004C460AA6 for ; Thu, 27 Nov 2025 03:23:09 +0100 (CET) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-47789cd2083so1244515e9.2 for ; Wed, 26 Nov 2025 18:23:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764210189; x=1764814989; 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=Tf4iz5iEYQ1oR7Y+wuSf5rxUztQz2jgouqu9GnH0HVI=; b=bmSd9sPie8FVuBAEliu+bdSuDudlYKGeP2r5KJeXhklxOnoiT6Zl7VeSxF8fpg0aR8 8/dYaRba2oMbtMWjgpVxEWf6xuIf1gDh4af6rHdSMKSfiZrqJxJFgEph0rx88EHVljiE iDNOGZ5M0HvtX7J6gAGY8Sg86I5KCLj0MZHq8ioPyF6MF5LrLkX+KIRTfHWwx5PvGAtt kS2PAXasQutNQ5xNyJlQMPq6bp7D96BEp4hE0wYHUCQmn/AwyU6dQqYq3Qx3Yb8Xbb20 63rTbReyK5NfsM3BpBYXgtvZPIyU/kvTjWe9RuN3XA9qfd0Cy5y3tClPGrjepUtAdtIn TShA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764210189; x=1764814989; 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=Tf4iz5iEYQ1oR7Y+wuSf5rxUztQz2jgouqu9GnH0HVI=; b=AcnJnXAHXMmgCF/rjXy9+WYveHlb1LP6bae6jUvZmiR620EvR2AQ1ua1Y1D3tTH1zi 9kw82gNG7VbOsM9bmJYGEYHDaC/zVTWbeZpLOB77Itx+9oTKMzOA6OeDMxrC8rX05V7E PTfTIlsF8lnIJ8vZKlkm5pXJzChUWU0IWVDpXYyBFkEc3kjsGn/fh2W4IGd+szNIvV05 vSrv+lvyVchTbwUh36l4d2Sg8LDD7004y0us2TSfXoW9eiUSIdFtx1t60M2eOn8DZcWi Wx/tRA56vpN5W7IdAydlZ5SXL2NeFL96ipz2MY9V+A054PB2ALnA0/4IAqYjZX4kFEs8 YnEA== X-Gm-Message-State: AOJu0YyYl5AXZUqNJaEw71x00myeivmPbLJFcZCHFPLFv7N34bVIYmhQ +/HxXPvYqfGoXeHBIl9EeBV3uwL19WhICRDhuwh/i2p7DBJ/3EI17k5jvjkFHoHKBNRsTKXDyyA 2p9+TrbI= X-Gm-Gg: ASbGncuZqp37hQYozgKss9Ou7ospzr6M3E4SK1GxPuUCIUUE/nkS99iU/ztlgOgYBb/ Iuj70V0CF9OWhmnoMGJ4Ej8WXFGOSL3JbYSGr9oOZmTbcndrBwFnSpe3Iyei+jLHjQV7I4UGG+s MY256QC11pNFENIhlyvBjMWdg8PNkKjVLYog0KVmz0NgZJhRPKfS+vwL9RXH270JVt4QH1n6Ai9 WoG7qswx5uIwpXkSp4conxDCW0XaAI0OyQgbLVceWE9MWpu4c8b+rGmzGW26fSwKcwg5mamYlPW PV3aYXF3ySMZ0Ay8/fzDlKt9HaL6/sGg0LUXmTI4aFxP48ds9yrh5qt9jau2l/ebW/OI2NeR0SQ Gy4wuXevMrAPGvD86VclKJZMB2W2M5UNNrupibQwWffCq48CuVhT/AoAqaSb2Sbh/iS2P/yD3V7 kVGvg/mZT9l21ED1sIXCg9ZkWZBFe39XhJ5xH9Izd/JxHg2/uaRqxsBfyMYE0dztskyqU= X-Google-Smtp-Source: AGHT+IHkhqhf4+Pz+N2NY5qxP1ZbpX2Zo5ycIkowSHr6A6BMxoiu0QO/n1k4hAqFrhs4ZipdWGi+9w== X-Received: by 2002:a05:600c:3b08:b0:477:214f:bd95 with SMTP id 5b1f17b1804b1-477c114df06mr209302975e9.23.1764210189144; Wed, 26 Nov 2025 18:23:09 -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 5b1f17b1804b1-4790b0e21e8sm71549495e9.15.2025.11.26.18.23.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 18:23:08 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue , Kieran Bingham Subject: [PATCH v2 03/22] meson: Automatically generate glsl_shaders.h from specified shader programs Date: Thu, 27 Nov 2025 02:22:35 +0000 Message-ID: <20251127022256.178929-4-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251127022256.178929-1-bryan.odonoghue@linaro.org> References: <20251127022256.178929-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. Acked-by: Kieran Bingham Signed-off-by: Bryan O'Donoghue --- src/libcamera/meson.build | 11 +++++++++++ src/libcamera/shaders/meson.build | 10 ++++++++++ utils/meson.build | 2 ++ 3 files changed, 23 insertions(+) create mode 100644 src/libcamera/shaders/meson.build diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 34e20f557..90d434a5a 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -76,6 +76,7 @@ subdir('ipa') subdir('pipeline') subdir('proxy') subdir('sensor') +subdir('shaders') subdir('software_isp') libdl = dependency('dl') @@ -182,6 +183,16 @@ libcamera_deps += [ libyaml, ] +# Generate headers from shaders +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 + # We add '/' to the build_rpath as a 'safe' path to act as a boolean flag. # The build_rpath is stripped at install time by meson, so we determine at # runtime if the library is running from an installed location by checking diff --git a/src/libcamera/shaders/meson.build b/src/libcamera/shaders/meson.build new file mode 100644 index 000000000..386b342d0 --- /dev/null +++ b/src/libcamera/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 95d657ac9..3deed8ad4 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')