Module: Mesa Branch: staging/22.2 Commit: 49fdd260a241a32fc018b3a9e0ddceb18418e248 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=49fdd260a241a32fc018b3a9e0ddceb18418e248
Author: pal1000 <[email protected]> Date: Thu Jul 21 13:02:07 2022 +0300 meson: Only draw with llvm depends on native directly Tests, softpipe or AMD drivers don't depend on it directly Fixes: 3955dd07 ("meson/gallium: Add an option to not use LLVM for gallium draw module") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6817 Reviewed-by: Erik Faye-Lund <[email protected]> Tested-by: Erik Faye-Lund <[email protected]> Reviewed-by: Jesse Natalie <[email protected]> Reviewed-by: Yonggang Luo <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17675> (cherry picked from commit f23dbcd6420188ba447e3fc50cf316dc20fb4114) --- .pick_status.json | 2 +- meson.build | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 53778f061c9..0cb861b4c1e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5944,7 +5944,7 @@ "description": "meson: Only draw with llvm depends on native directly Tests, softpipe or AMD drivers don't depend on it directly", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "3955dd077b61ad4f39d7ecbfaa78b183c2142269" }, diff --git a/meson.build b/meson.build index d129ff0bcf6..250b52886e5 100644 --- a/meson.build +++ b/meson.build @@ -1713,7 +1713,7 @@ endif llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit', 'core', 'executionengine', 'scalaropts', 'transformutils', 'instcombine'] llvm_optional_modules = ['coroutines'] if with_amd_vk or with_gallium_radeonsi or with_gallium_r600 - llvm_modules += ['amdgpu', 'native', 'bitreader', 'ipo'] + llvm_modules += ['amdgpu', 'bitreader', 'ipo'] if with_gallium_r600 llvm_modules += 'asmparser' endif @@ -1729,7 +1729,8 @@ if with_clc llvm_modules += ['coverage', 'target', 'linker', 'irreader', 'option', 'libdriver', 'lto'] llvm_optional_modules += ['all-targets'] endif -if with_tests or with_gallium_softpipe +draw_with_llvm = get_option('draw-use-llvm') +if draw_with_llvm llvm_modules += 'native' endif @@ -1777,7 +1778,6 @@ endif dep_llvm = null_dep with_llvm = false -draw_with_llvm = get_option('draw-use-llvm') if _llvm != 'disabled' dep_llvm = dependency( 'llvm',
