{"id":27145,"url":"https://patchwork.libcamera.org/api/patches/27145/?format=json","web_url":"https://patchwork.libcamera.org/patch/27145/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260630125214.3327516-4-laurent.pinchart@ideasonboard.com>","date":"2026-06-30T12:52:12","name":"[v2,3/5] utils: Rename and move shader header generation script","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"60f30abd69f5241b49053cdfd34bdd8883fac626","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/27145/mbox/","series":[{"id":6029,"url":"https://patchwork.libcamera.org/api/series/6029/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=6029","date":"2026-06-30T12:52:09","name":"libcamera: Improve shader header generation","version":2,"mbox":"https://patchwork.libcamera.org/series/6029/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/27145/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/27145/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 28A5EC3304\n\tfor ;\n\tTue, 30 Jun 2026 12:52:24 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F09F665F7D;\n\tTue, 30 Jun 2026 14:52:22 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5486265F66\n\tfor ;\n\tTue, 30 Jun 2026 14:52:19 +0200 (CEST)","from killaraus.ideasonboard.com\n\t(2001-14ba-70f3-e800--a06.rev.dnainternet.fi\n\t[IPv6:2001:14ba:70f3:e800::a06])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6E47C104C;\n\tTue, 30 Jun 2026 14:51:35 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"CtxeyKod\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1782823895;\n\tbh=aoD+5ADldUeovvxl+kWuJl5hJWn4cA6jOC6DlPuOLQw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=CtxeyKodJMGgOCmjk/BsFY5zGk5cOsWoqk6JKj+YiemhXdArvx7u4EZ6WP65xKdrJ\n\trm/wr4ORVKHYEcQwiZAyKankDAliCMsXyZWlRN8q4N0uEaUcwBoChtJ9aQj/r1VGEA\n\t4kwxW+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\n\tscript","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","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The gen-shader-headers.py script generates a single header. Rename it to\ngen-shader-header.py, and move it to the codegen directory with the\nother code generation scripts.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Milan Zamazal \nReviewed-by: Barnabás Pőcze \nReviewed-by: Bryan O'Donoghue \n---\n src/libcamera/shaders/meson.build | 8 ++++----\n .../gen-shader-header.py} | 0\n utils/codegen/meson.build | 1 +\n utils/meson.build | 2 --\n 4 files changed, 5 insertions(+), 6 deletions(-)\n rename utils/{gen-shader-headers.py => codegen/gen-shader-header.py} (100%)","diff":"diff --git a/src/libcamera/shaders/meson.build b/src/libcamera/shaders/meson.build\nindex 4f4e8da607c7..c409ff9b0b1c 100644\n--- a/src/libcamera/shaders/meson.build\n+++ b/src/libcamera/shaders/meson.build\n@@ -9,12 +9,12 @@ shader_files = files([\n 'identity.vert',\n ])\n \n-# Generate headers from shaders\n-libcamera_shader_headers = custom_target(\n+# Generate header from shaders\n+libcamera_shader_header = custom_target(\n 'gen-shader-headers',\n input : [shader_files],\n output : 'glsl_shaders.h',\n- command : [gen_shader_headers, '-o', '@OUTPUT@', '@INPUT@'],\n+ command : [gen_shader_header, '-o', '@OUTPUT@', '@INPUT@'],\n )\n \n-libcamera_internal_headers += libcamera_shader_headers\n+libcamera_internal_headers += libcamera_shader_header\ndiff --git a/utils/gen-shader-headers.py b/utils/codegen/gen-shader-header.py\nsimilarity index 100%\nrename from utils/gen-shader-headers.py\nrename to utils/codegen/gen-shader-header.py\ndiff --git a/utils/codegen/meson.build b/utils/codegen/meson.build\nindex 8d1c690866e1..70c228d68804 100644\n--- a/utils/codegen/meson.build\n+++ b/utils/codegen/meson.build\n@@ -14,6 +14,7 @@ gen_formats = files('gen-formats.py')\n gen_gst_controls = files('gen-gst-controls.py')\n gen_header = files('gen-header.sh')\n gen_ipa_pub_key = files('gen-ipa-pub-key.py')\n+gen_shader_header = files('gen-shader-header.py')\n gen_tracepoints = files('gen-tp-header.py')\n \n py_mod_controls = files('controls.py')\ndiff --git a/utils/meson.build b/utils/meson.build\nindex 17a7aa7c3f5e..6e1b885b3688 100644\n--- a/utils/meson.build\n+++ b/utils/meson.build\n@@ -3,8 +3,6 @@\n subdir('codegen')\n subdir('ipu3')\n \n-gen_shader_headers = files('gen-shader-headers.py')\n-\n ## Module signing\n gen_ipa_priv_key = files('gen-ipa-priv-key.sh')\n \n","prefixes":["v2","3/5"]}