Mesa (main): meson: Tell glslang to be quiet.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: bf6372df62f222a69ce9e7b93d6b2a5256c9f8bb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf6372df62f222a69ce9e7b93d6b2a5256c9f8bb

Author: Georg Lehmann <dadschoorse at gmail.com>
Date:   Tue May  3 21:57:23 2022 +0200

meson: Tell glslang to be quiet.

Without --quiet glslang unconditionally prints the input file name to stdout.
Check if --quiet is supported because some distros only have ancient glslang
versions.

Signed-off-by: Georg Lehmann <dadschoorse at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16312>

---

 meson.build                                   | 5 +++++
 src/amd/vulkan/radix_sort/shaders/meson.build | 2 +-
 src/vulkan/overlay-layer/meson.build          | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 4e4d9e70bbc..9f93ad52be7 100644
--- a/meson.build
+++ b/meson.build
@@ -687,6 +687,11 @@ endif
 
 if with_vulkan_overlay_layer or with_aco_tests or with_amd_vk
   prog_glslang = find_program('glslangValidator')
+  if run_command(prog_glslang, [ '--quiet', '--version' ], check : false).returncode() == 0
+    glslang_quiet = ['--quiet']
+  else
+    glslang_quiet = []
+  endif
 endif
 
 _xvmc = get_option('gallium-xvmc')
diff --git a/src/amd/vulkan/radix_sort/shaders/meson.build b/src/amd/vulkan/radix_sort/shaders/meson.build
index e3506fb6654..0f9b27edd61 100644
--- a/src/amd/vulkan/radix_sort/shaders/meson.build
+++ b/src/amd/vulkan/radix_sort/shaders/meson.build
@@ -46,6 +46,6 @@ foreach s : radix_sort_shaders
     s + '.spv.h',
     input : s,
     output : s + '.spv.h',
-    command : [prog_glslang, '-V', '-I' + shader_include_dir, '--target-env', 'spirv1.3', '-x', '-o', '@OUTPUT@', '@INPUT@'],
+    command : [prog_glslang, '-V', '-I' + shader_include_dir, '--target-env', 'spirv1.3', '-x', '-o', '@OUTPUT@', '@INPUT@'] + glslang_quiet,
     depend_files: shader_include_files)
 endforeach
diff --git a/src/vulkan/overlay-layer/meson.build b/src/vulkan/overlay-layer/meson.build
index 84cc8862e69..7854847d3f8 100644
--- a/src/vulkan/overlay-layer/meson.build
+++ b/src/vulkan/overlay-layer/meson.build
@@ -26,7 +26,7 @@ overlay_spv = []
 foreach s : ['overlay.frag', 'overlay.vert']
   overlay_spv += custom_target(
     s + '.spv.h', input : s, output : s + '.spv.h',
-    command : [prog_glslang, '-V', '-x', '-o', '@OUTPUT@', '@INPUT@'])
+    command : [prog_glslang, '-V', '-x', '-o', '@OUTPUT@', '@INPUT@'] + glslang_quiet)
 endforeach
 
 vklayer_files = files(