Patch Detail
Show a patch.
GET /api/patches/27144/?format=api
{ "id": 27144, "url": "https://patchwork.libcamera.org/api/patches/27144/?format=api", "web_url": "https://patchwork.libcamera.org/patch/27144/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "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-3-laurent.pinchart@ideasonboard.com>", "date": "2026-06-30T12:52:11", "name": "[v2,2/5] utils: Merge shader header generation scripts", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "008b88b31e93993976d47836004353a38cf22a83", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/27144/mbox/", "series": [ { "id": 6029, "url": "https://patchwork.libcamera.org/api/series/6029/?format=api", "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/27144/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/27144/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 AA0D1C3261\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 30 Jun 2026 12:52:22 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9780765F86;\n\tTue, 30 Jun 2026 14:52:21 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F240165F83\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 30 Jun 2026 14:52:17 +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 116D8104C;\n\tTue, 30 Jun 2026 14:51:34 +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=\"qJsOCHQy\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1782823894;\n\tbh=sJ3i0n5zX6A30SeRiGQMKWo5vlHoEUSmKe4CmZToEG4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=qJsOCHQyTlF5t+6/0eoq2S6DrBFBPm4LWQVUkmHMpqz76OOQVn2NF4GiXAvKLITVH\n\tHob3Ogr2XdhSRW8Pbv2zAl+BfFl8f/39kCBa2oW/uJFj8bBO/sbmiiIBd3GbVKiEhi\n\tGk+IoTXiKPh2y6sfuLVMpA3gHgHNrdqzBaJuvekI=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Bryan O'Donoghue <bryan.odonoghue@linaro.org>", "Subject": "[PATCH v2 2/5] utils: Merge shader header generation scripts", "Date": "Tue, 30 Jun 2026 15:52:11 +0300", "Message-ID": "<20260630125214.3327516-3-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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The shader header is generated by a combination of a shell script and a\nPython script. Simplify this by merging everything into a single script.\n\nThe output of the old and new script only differ in white spaces.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Milan Zamazal <mzamazal@redhat.com>\nReviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>\nReviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>\n---\nChanges since v1:\n\n- Replace os.path with pathlib.Path\n- Rename \"input\" argument to \"inputs\"\n- Move first line of multi-line strings to left column\n---\n src/libcamera/shaders/meson.build | 2 +-\n utils/gen-shader-header.py | 37 ----------------\n utils/gen-shader-headers.py | 73 +++++++++++++++++++++++++++++++\n utils/gen-shader-headers.sh | 54 -----------------------\n utils/meson.build | 2 +-\n 5 files changed, 75 insertions(+), 93 deletions(-)\n delete mode 100755 utils/gen-shader-header.py\n create mode 100755 utils/gen-shader-headers.py\n delete mode 100755 utils/gen-shader-headers.sh", "diff": "diff --git a/src/libcamera/shaders/meson.build b/src/libcamera/shaders/meson.build\nindex adac77327a3b..4f4e8da607c7 100644\n--- a/src/libcamera/shaders/meson.build\n+++ b/src/libcamera/shaders/meson.build\n@@ -14,7 +14,7 @@ libcamera_shader_headers = custom_target(\n 'gen-shader-headers',\n input : [shader_files],\n output : 'glsl_shaders.h',\n- command : [gen_shader_headers, meson.project_source_root(), '@OUTPUT@', '@INPUT@'],\n+ command : [gen_shader_headers, '-o', '@OUTPUT@', '@INPUT@'],\n )\n \n libcamera_internal_headers += libcamera_shader_headers\ndiff --git a/utils/gen-shader-header.py b/utils/gen-shader-header.py\ndeleted file mode 100755\nindex 745852b4c03f..000000000000\n--- a/utils/gen-shader-header.py\n+++ /dev/null\n@@ -1,37 +0,0 @@\n-#!/usr/bin/env python3\n-# SPDX-License-Identifier: GPL-2.0-or-later\n-# Copyright (C) 2025, Bryan O'Donoghue.\n-#\n-# Author: Bryan O'Donoghue <bryan.odonoghue@linaro.org>\n-#\n-# A Python script which takes a list of shader files and converts each of them\n-# into a C header.\n-#\n-import sys\n-\n-try:\n- with open(sys.argv[2], \"rb\") as file:\n- data = file.read()\n- data_len = len(data)\n-\n- name = sys.argv[1].replace(\".\", \"_\")\n- name_len = name + \"_len\"\n-\n- j = 0\n- print(\"unsigned char const\", name, \"[] = {\")\n- for ch in data:\n- print(f\"0x{ch:02x}, \", end=\"\")\n- j = (j + 1) % 16\n- if j == 0:\n- print()\n- if j != 0:\n- print()\n- print(\"};\")\n-\n- print()\n- print(f\"const unsigned int {name_len}={data_len};\")\n-\n-except FileNotFoundError:\n- print(f\"File {sys.argv[2]} not found\", file=sys.stderr)\n-except IOError:\n- print(f\"Unable to read {sys.argv[2]}\", file=sys.stderr)\ndiff --git a/utils/gen-shader-headers.py b/utils/gen-shader-headers.py\nnew file mode 100755\nindex 000000000000..fe4f06065f0c\n--- /dev/null\n+++ b/utils/gen-shader-headers.py\n@@ -0,0 +1,73 @@\n+#!/usr/bin/env python3\n+# SPDX-License-Identifier: GPL-2.0-or-later\n+#\n+# Copyright (C) 2025, Bryan O'Donoghue\n+# Copyright (C) 2026, Ideas on Board Oy\n+#\n+# Generate a C header file containing hex-encoded shader sources\n+\n+import argparse\n+import binascii\n+import math\n+import pathlib\n+import sys\n+\n+\n+def process_file(path, out):\n+ data = open(path, 'rb').read()\n+\n+ hex_data = [f'0x{c:02x}' for c in data]\n+ var_name = path.name.replace('.', '_')\n+\n+ out.write(f'unsigned char const {var_name}[] = {{\\n')\n+\n+ for i in range(math.ceil(len(data) / 16)):\n+ out.write('\\t')\n+ out.write(', '.join(hex_data[16 * i:16 * (i + 1)]))\n+ out.write(',\\n')\n+\n+ out.write('};\\n\\n')\n+ out.write(f'const unsigned int {var_name}_len = {len(data)};\\n')\n+\n+\n+def main(argv):\n+ parser = argparse.ArgumentParser(\n+ description='Generate a C header file containing hex-encoded shader sources')\n+ parser.add_argument('--output', '-o', metavar='file', default=sys.stdout,\n+ type=argparse.FileType('w', encoding='utf-8'),\n+ help='Output file name. Defaults to standard output if not specified.')\n+ parser.add_argument('inputs', nargs='+', type=pathlib.Path,\n+ help='Input file names.')\n+ args = parser.parse_args(argv[1:])\n+\n+ args.output.write('''\\\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/* This file is auto-generated, do not edit! */\n+\n+#pragma once\n+\n+/*\n+ * List the names of the shaders at the top of header for readability's sake.\n+ *\n+''')\n+\n+ for path in args.inputs:\n+ name = path.name.replace('.', '_')\n+ args.output.write(f' * unsigned char {name};\\n')\n+\n+ args.output.write('''\\\n+ */\n+\n+/* Hex encoded shader data */\n+''')\n+\n+ for path in args.inputs:\n+ process_file(path, args.output)\n+ args.output.write('\\n')\n+\n+ return 0\n+\n+\n+if __name__ == '__main__':\n+ sys.exit(main(sys.argv))\n+\ndiff --git a/utils/gen-shader-headers.sh b/utils/gen-shader-headers.sh\ndeleted file mode 100755\nindex 0d6649521a7a..000000000000\n--- a/utils/gen-shader-headers.sh\n+++ /dev/null\n@@ -1,54 +0,0 @@\n-#!/bin/sh\n-# SPDX-License-Identifier: GPL-2.0-or-later\n-\n-set -e\n-\n-usage() {\n-\techo \"Usage: $0 <src_dir> <output_header> <shader_file1> [shader_file2 ...]\"\n-\techo\n-\techo \"Generates a C header file containing hex-encoded shader data.\"\n-\techo\n-\techo \"Arguments:\"\n-\techo \" src_dir Path to the base of the source directory\"\n-\techo \" output_header Path to the generated header file\"\n-\techo \" shader_file(s) One or more shader files to embed in the header\"\n-\texit 1\n-}\n-\n-if [ $# -lt 4 ]; then\n-\techo \"Error: Invalid argument count.\"\n-\tusage\n-fi\n-\n-src_dir=\"$1\"; shift\n-build_path=\"$1\"; shift\n-\n-cat <<EOF > \"$build_path\"\n-/* SPDX-License-Identifier: LGPL-2.1-or-later */\n-/* This file is auto-generated, do not edit! */\n-\n-#pragma once\n-\n-EOF\n-\n-cat <<EOF >> \"$build_path\"\n-/*\n- * List the names of the shaders at the top of\n- * header for readability's sake\n- *\n-EOF\n-\n-for file in \"$@\"; do\n-\tname=$(basename \"$file\" | tr '.' '_')\n-\techo \"[SHADER-GEN] $name\"\n-\techo \" * unsigned char $name;\" >> \"$build_path\"\n-done\n-\n-echo \"*/\" >> \"$build_path\"\n-\n-echo \"/* Hex encoded shader data */\" >> \"$build_path\"\n-for file in \"$@\"; do\n-\tname=$(basename \"$file\")\n-\t\"$src_dir/utils/gen-shader-header.py\" \"$name\" \"$file\" >> \"$build_path\"\n-\techo >> \"$build_path\"\n-done\ndiff --git a/utils/meson.build b/utils/meson.build\nindex 9c598793035c..17a7aa7c3f5e 100644\n--- a/utils/meson.build\n+++ b/utils/meson.build\n@@ -3,7 +3,7 @@\n subdir('codegen')\n subdir('ipu3')\n \n-gen_shader_headers = files('gen-shader-headers.sh')\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", "prefixes": [ "v2", "2/5" ] }