aboutsummaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2021-11-07 13:22:14 +0100
committerSimon Zeni <simon@bl4ckb0ne.ca>2021-11-23 15:38:56 +0000
commit5332935afcdd519dd2dd9dbfeb50c6aa0f91e9c3 (patch)
treedb58b4cefc37943e1f7c3ca9bf57ba679fdb964d /render
parent1d9c1bcea6a223379af63b4d779d53663eaffcf8 (diff)
render/vulkan: quiet glslangValidator
This suppresses the output filename printed to stdout. Errors and warnings should still be printed to stderr as usual.
Diffstat (limited to 'render')
-rw-r--r--render/vulkan/meson.build3
-rw-r--r--render/vulkan/shaders/meson.build3
2 files changed, 6 insertions, 0 deletions
diff --git a/render/vulkan/meson.build b/render/vulkan/meson.build
index 6ae8df0c..0c45a713 100644
--- a/render/vulkan/meson.build
+++ b/render/vulkan/meson.build
@@ -33,6 +33,9 @@ if not glslang.found()
endif
endif
+glslang_version_info = run_command(glslang, '--version', check: true).stdout()
+glslang_version = glslang_version_info.split('\n')[0].split(':')[-1]
+
wlr_files += files(
'renderer.c',
'texture.c',
diff --git a/render/vulkan/shaders/meson.build b/render/vulkan/shaders/meson.build
index b183c46c..906618c2 100644
--- a/render/vulkan/shaders/meson.build
+++ b/render/vulkan/shaders/meson.build
@@ -8,6 +8,9 @@ vulkan_shaders = []
foreach shader : vulkan_shaders_src
name = shader.underscorify() + '_data'
args = [glslang, '-V', '@INPUT@', '-o', '@OUTPUT@', '--vn', name]
+ if glslang_version.version_compare('>=11.0.0')
+ args += '--quiet'
+ endif
header = custom_target(
shader + '_spv',
output: shader + '.h',