From 262719e963ba838da9f5221152dfeaae65f960ec Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 22 Sep 2022 13:08:59 +0300 Subject: [PATCH] meson: bump required llvm-spirv version with intel-clc Signed-off-by: Lionel Landwerlin Part-of: --- meson.build | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 23d84adc0b0..3afdbcd0956 100644 --- a/meson.build +++ b/meson.build @@ -1771,7 +1771,9 @@ if draw_with_llvm llvm_modules += 'native' endif -if with_amd_vk or with_gallium_radeonsi or with_gallium_opencl +if with_intel_clc + _llvm_version = '>= 13.0.0' +elif with_amd_vk or with_gallium_radeonsi or with_gallium_opencl _llvm_version = '>= 11.0.0' elif with_clc _llvm_version = '>= 10.0.0' @@ -1888,12 +1890,18 @@ if with_opencl_spirv # Require an SPIRV-LLVM-Translator version compatible with the chosen LLVM # one. + + # This first version check is still needed as maybe LLVM 8.0 was picked but + # we do not want to accept SPIRV-LLVM-Translator 8.0.0.1 as that version + # does not have the required API and those are only available starting from + # 8.0.1.3. + _llvmspirvlib_min_version = '>= 8.0.1.3' + if with_intel_clc + _llvmspirvlib_min_version = '>= 13.0.0.0' + endif + _llvmspirvlib_version = [ - # This first version check is still needed as maybe LLVM 8.0 was picked but - # we do not want to accept SPIRV-LLVM-Translator 8.0.0.1 as that version does - # not have the required API and those are only available starting from - # 8.0.1.3. - '>= 8.0.1.3', + _llvmspirvlib_min_version, '>= @0@.@1@'.format(chosen_llvm_version_major, chosen_llvm_version_minor), '< @0@.@1@'.format(chosen_llvm_version_major, chosen_llvm_version_minor + 1) ]