From patchwork Tue Jun 30 12:52:12 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 27145 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 28A5EC3304 for ; Tue, 30 Jun 2026 12:52:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id F09F665F7D; Tue, 30 Jun 2026 14:52:22 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="CtxeyKod"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5486265F66 for ; Tue, 30 Jun 2026 14:52:19 +0200 (CEST) Received: from killaraus.ideasonboard.com (2001-14ba-70f3-e800--a06.rev.dnainternet.fi [IPv6:2001:14ba:70f3:e800::a06]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6E47C104C; Tue, 30 Jun 2026 14:51:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1782823895; bh=aoD+5ADldUeovvxl+kWuJl5hJWn4cA6jOC6DlPuOLQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CtxeyKodJMGgOCmjk/BsFY5zGk5cOsWoqk6JKj+YiemhXdArvx7u4EZ6WP65xKdrJ rm/wr4ORVKHYEcQwiZAyKankDAliCMsXyZWlRN8q4N0uEaUcwBoChtJ9aQj/r1VGEA 4kwxW+ljfVOHTR+fk03N7IZ4akvXhbT1+9PcQxSs= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Cc: Bryan O'Donoghue Subject: [PATCH v2 3/5] utils: Rename and move shader header generation script Date: Tue, 30 Jun 2026 15:52:12 +0300 Message-ID: <20260630125214.3327516-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260630125214.3327516-1-laurent.pinchart@ideasonboard.com> References: <20260630125214.3327516-1-laurent.pinchart@ideasonboard.com> 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" The gen-shader-headers.py script generates a single header. Rename it to gen-shader-header.py, and move it to the codegen directory with the other code generation scripts. Signed-off-by: Laurent Pinchart Reviewed-by: Milan Zamazal Reviewed-by: Barnabás Pőcze Reviewed-by: Bryan O'Donoghue --- src/libcamera/shaders/meson.build | 8 ++++---- .../gen-shader-header.py} | 0 utils/codegen/meson.build | 1 + utils/meson.build | 2 -- 4 files changed, 5 insertions(+), 6 deletions(-) rename utils/{gen-shader-headers.py => codegen/gen-shader-header.py} (100%) diff --git a/src/libcamera/shaders/meson.build b/src/libcamera/shaders/meson.build index 4f4e8da607c7..c409ff9b0b1c 100644 --- a/src/libcamera/shaders/meson.build +++ b/src/libcamera/shaders/meson.build @@ -9,12 +9,12 @@ shader_files = files([ 'identity.vert', ]) -# Generate headers from shaders -libcamera_shader_headers = custom_target( +# Generate header from shaders +libcamera_shader_header = custom_target( 'gen-shader-headers', input : [shader_files], output : 'glsl_shaders.h', - command : [gen_shader_headers, '-o', '@OUTPUT@', '@INPUT@'], + command : [gen_shader_header, '-o', '@OUTPUT@', '@INPUT@'], ) -libcamera_internal_headers += libcamera_shader_headers +libcamera_internal_headers += libcamera_shader_header diff --git a/utils/gen-shader-headers.py b/utils/codegen/gen-shader-header.py similarity index 100% rename from utils/gen-shader-headers.py rename to utils/codegen/gen-shader-header.py diff --git a/utils/codegen/meson.build b/utils/codegen/meson.build index 8d1c690866e1..70c228d68804 100644 --- a/utils/codegen/meson.build +++ b/utils/codegen/meson.build @@ -14,6 +14,7 @@ gen_formats = files('gen-formats.py') gen_gst_controls = files('gen-gst-controls.py') gen_header = files('gen-header.sh') gen_ipa_pub_key = files('gen-ipa-pub-key.py') +gen_shader_header = files('gen-shader-header.py') gen_tracepoints = files('gen-tp-header.py') py_mod_controls = files('controls.py') diff --git a/utils/meson.build b/utils/meson.build index 17a7aa7c3f5e..6e1b885b3688 100644 --- a/utils/meson.build +++ b/utils/meson.build @@ -3,8 +3,6 @@ subdir('codegen') subdir('ipu3') -gen_shader_headers = files('gen-shader-headers.py') - ## Module signing gen_ipa_priv_key = files('gen-ipa-priv-key.sh')