From patchwork Thu Dec 11 23:22:28 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: 25497 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 CAB3EC3257 for ; Thu, 11 Dec 2025 23:23:22 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7BAB16162B; Fri, 12 Dec 2025 00:23:22 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="SUW4lDOO"; dkim-atps=neutral Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CB07F6161D for ; Fri, 12 Dec 2025 00:23:20 +0100 (CET) Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-7aad4823079so605521b3a.0 for ; Thu, 11 Dec 2025 15:23:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765495399; x=1766100199; 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=pQX41AGsNI0QCoqx36ezoVqFb8YAenUUt7bw97cItvQ=; b=SUW4lDOOjV60pZ0hOaq32pl6+5gm+E0BbLb9vHhs6AncLzT28Gtchx4hyqTeRpmfRF v7svnqEywVXTAvw+1oEgiOxPqkWIpJZcgyREdOQ8t8WCXB8YttIvhNxHI+FVBtnvO+79 8/1o26YXt3Y+dp5J4/dvg0zr6b2AL312FKcI0/15Z59tMcU+93JuvjxRHFECtisJqtvJ EXMX9Y2E7EPod3Tv/TQn8VAHpfcfBYrQ4R3W2LrBxkom0C2mTZkXViM6DZG81FVauUIz 4f0gstSw9wk/xNCUA2xPpADiZ0UcA5vMMgsWueo/X5njIDfK3D7o3HwBlFOPxa6hrgnI oQKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765495399; x=1766100199; 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=pQX41AGsNI0QCoqx36ezoVqFb8YAenUUt7bw97cItvQ=; b=paBr95IxyhKPJJRhdA0ZyqZUkJcRxo6wW399ZZjq9wUbnsXQLj+ar7ZBAJ2IDsSgP4 fiPy7r55YbsXUQFF9k5i2Sk20QunKqjbqbUom5lnOa+WQJt0tgKu46yLH2TxY6HwXPkX G61+ymYzJ0FoiDW/c8Cz7TgosPSnhXCq08oBNquZtDBDQVByZra4HyUM6tpSR1TpkYvL naJCQdiLYRSd4PuoVxiZESCcj4/NZUpnoZawvw3in3GUDJTyJ0tQiWtBtCB5B9MtLS9w LetZhxdktb6fQymfNF829HNyQl639AKc0MLHEl3DtExqVGTPfZZdBeOy52t4G30o3rGE AiAw== X-Gm-Message-State: AOJu0YzodrkRyJUhFUoR754ZIZ0oDrv8vu/Rn3OCKw/mfw8Ig3H2tCFc j9I3PXLZPhKw6gjC7S2I8KIdHzD3y7/d+l1qb3IPsR6sGxY/7LvtBBayQ4hhRc2p9I8S8ApwDov /CCCP X-Gm-Gg: AY/fxX4TLhukCLgTtAS03ufIdOrDtJ7lO8SwxtAnAWXWDtnBVPINfzDeYqS1t4DBinh /7O7EUTZbEKF6V9fjWb8bVIOkwHMifbqePuSiXRCPNLvJUj8mN7Yq08EdOrhfh0iJKkJwa9Kbop zrMn1yZ0IncRU4Q8YrcV42DXKOrTh/tELjMntT+QBmenCQXjH7q+nU+ZSPLabxRJV8rLrNnBH5a 9HlZzMzE74D/I80dJimyc6zzOu1a7aABiAx4ztW03/8rt8R4bmA3lqNGhVK1yqgWeYkPNxM8TGp a95OJO8T3eWvP7AmrDTfbA3bWETuetdj2EQeYMc4LNzMkw5vm0JF9zQSTYKHJuX5D6Jhr6+FcBy OQQlvDmb6y70DQWUcGvyTHD3UmW1BXrP75Z6NqH1LdQ7MvMAXoyFSgEj5/Lna2aRNRjrbLBnWp+ SHByc9c0xTQcCZYlA4VUPc6pv8LJt/LvD1dYPmgBTGVJOfOH5eJSHbpcyOBZhSfg== X-Google-Smtp-Source: AGHT+IGI8ur9dGb+G09c5GWu15KRXefG9xW53I1tqXAJ5q9mYUuAmK9ROY1rUruq5VftY5cUzgLD4A== X-Received: by 2002:a05:6a00:414c:b0:7e8:4471:8db with SMTP id d2e1a72fcca58-7f66a07d105mr171733b3a.60.1765495399145; Thu, 11 Dec 2025 15:23:19 -0800 (PST) Received: from inspiron14p-linux (M106185144161.v4.enabler.ne.jp. [106.185.144.161]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7f4c4ab52aasm3399933b3a.38.2025.12.11.15.23.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Dec 2025 15:23:18 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue , Kieran Bingham , Milan Zamazal Subject: [PATCH v5 03/20] meson: Automatically generate glsl_shaders.h from specified shader programs Date: Thu, 11 Dec 2025 23:22:28 +0000 Message-ID: <20251211232246.31330-4-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251211232246.31330-1-bryan.odonoghue@linaro.org> References: <20251211232246.31330-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 Reviewed-by: Milan Zamazal 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')