From patchwork Tue Dec 2 13:31:34 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: 25289 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 4EBE9BD80A for ; Tue, 2 Dec 2025 13:32:11 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8049F60C90; Tue, 2 Dec 2025 14:32:09 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="wuMWU6Wx"; dkim-atps=neutral Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7DBD360C7C for ; Tue, 2 Dec 2025 14:32:04 +0100 (CET) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-477619f8ae5so38509275e9.3 for ; Tue, 02 Dec 2025 05:32:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764682324; x=1765287124; 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=CzxKgbIUkNM+BfaM3eBJB+kd44Z0ws3zBBlfjb3fc6Q=; b=wuMWU6WxmGfpAiOcGKdnlxkrrWyg6S9R8STOdP0674gz8amPIa1tpGNMSlJhkOXSe+ JCTeOdidPtIx/ozMDHs/1FgX7UZWp1uONnDCt/rk8ycccVBtov0sQuI1bQpRm+qAO+w2 NCZ1N3tF8m2DZmss0Np0KI43y8YTCvNgxamGiCdR6pH0ScZa5ZjCAjaSqApWaFReDuKT gHBmxS+uxPUsEMPz0DYtGFVRuC0j7aHAngaVN5xzK5Tq5XcmU79z4ET4f9517osxVlSr fyEdDb30zs0HjzmTB3FJUuFg84KKDZGnyD733j+YhYw1kwH2eCOYcnjppe0HYrKF3kLx EX9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764682324; x=1765287124; 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=CzxKgbIUkNM+BfaM3eBJB+kd44Z0ws3zBBlfjb3fc6Q=; b=si41N3aXxMkhEmFHoAsKGZWcIeyUX6s+SSRzryWJmVAorArpEPj0P8EN/hgPqPJjym dRkfrGeLRnMKiEyceQ/Oo1SPsHp+VbiUE5k2dmQAEYNfh0HwPMWFXo2iM7olveeVKanB r+qqJq6pxT8BOh+/N+L9NMgohWqAyn4BMWY9akdsDw1UoWqTXObglhycILrCPbXOmP7P KzSaH/wixY0CY8201CX02WT0ykmgSRFNxVE2wb0WFvxHzfXrU1rGrhHuTfpJgwTiJvXQ HMcUXT5g0fE+Z8+W/wsPiNM0velxG0ALcF3R6TVfoBv2URaboDJ+QgjJjuTT/MPOCBsR YwaQ== X-Gm-Message-State: AOJu0YzY/mKTyGyMtBCgqFX31F9b8xXGUho7HvT7zvjC+5+4ezuBtgSy x6agOndrBNBhtN+x1HsHS3/udMKovfXpvuvKNclZqnkezGs2MMwj0zsROvR6azoAvd0YwUj05vh 0unAP X-Gm-Gg: ASbGncsa5LFYkNKUvAyU79kNT3fimHarYKoAhqLjbRM5la3RgCLVe46jjHpXOpoB62s oKJApdUBtUHTfHHNhJtqhCazKZqwO1RrZy0xnRkh9b3x72+E2FOidL/T+MI26MkdDT3ydSVjlnK alcSljjYmMF/0JUhsjXc0PWDrLx+8+GoS4XhOvWwLlQXX2wg18jhZPYI/kh7TaBZwAIFzFhinvR eDR4x5ohbKd35rEdniYy/VF4nGZnTJBsJ9qS3sH5SuZC9sZXz1vXIIRb3wfYgS+bN36rKkommze dP3glGYJrlZHs6DnJJIu7EeJtSEFzGFRDg2uQ0+8ZekIe0o1vi85VOdhxdbzTtP7LJEFwqkFWG1 NfUdK95OA+eMvyi+cTm3tpri2rdZyLPUQ0yQhwMbiqgiIA7ZRPTGAIDmdI8zG8LlQsPJNgYvVlb D7CUl3wOIfpjG2n7sc5ao2vBer7SAxqvv4B/am0wK62GobCzlAztE+4exApmCWqpiT6d4= X-Google-Smtp-Source: AGHT+IEocgbaTzgsj6kQhUGnEvNjtNF7bate3Ak9XrknE2ZaR2EgXQ5gNgecTptCFrk/paovlK1Mug== X-Received: by 2002:a05:6000:22c9:b0:42b:2eb3:c910 with SMTP id ffacd0b85a97d-42cc1cd9466mr44452320f8f.3.1764682323814; Tue, 02 Dec 2025 05:32:03 -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-42e1c5c30c4sm33363322f8f.9.2025.12.02.05.32.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Dec 2025 05:32:03 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue , Kieran Bingham Subject: [PATCH v3 03/22] meson: Automatically generate glsl_shaders.h from specified shader programs Date: Tue, 2 Dec 2025 13:31:34 +0000 Message-ID: <20251202133157.661407-4-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251202133157.661407-1-bryan.odonoghue@linaro.org> References: <20251202133157.661407-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')