[v2,3/5] utils: Rename and move shader header generation script
diff mbox series

Message ID 20260630125214.3327516-4-laurent.pinchart@ideasonboard.com
State New
Headers show
Series
  • libcamera: Improve shader header generation
Related show

Commit Message

Laurent Pinchart June 30, 2026, 12:52 p.m. UTC 
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 <laurent.pinchart@ideasonboard.com>
Reviewed-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
 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%)

Patch
diff mbox series 

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')