From d692ce4b34f238cd403f2cfe19fdf4103e2386db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sat, 21 Mar 2026 00:56:49 -0400 Subject: [PATCH] radeonsi/meson: don't use llvm variables when LLVM is disabled also winsys doesn't use LLVM Reviewed-by: Pierre-Eric Part-of: --- src/gallium/drivers/radeonsi/meson.build | 6 +++--- src/gallium/winsys/amdgpu/drm/meson.build | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build index decb676fed4..02aba1d31a9 100644 --- a/src/gallium/drivers/radeonsi/meson.build +++ b/src/gallium/drivers/radeonsi/meson.build @@ -86,8 +86,8 @@ files_libradeonsi = files( ) radeonsi_include_dirs = [inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common, - inc_amd_common_llvm, inc_gallium_drivers, inc_compiler, inc_amd, inc_amd_vpe, inc_virtio_gpu] -radeonsi_deps = [dep_llvm, dep_clock, dep_libdrm, idep_nir_headers, idep_amd_generated_headers, + inc_gallium_drivers, inc_compiler, inc_amd, inc_amd_vpe, inc_virtio_gpu] +radeonsi_deps = [dep_clock, dep_libdrm, idep_nir_headers, idep_amd_generated_headers, idep_mesautil, idep_aco, idep_u_tracepoints, idep_si_tracepoints] if with_perfetto @@ -173,7 +173,7 @@ libradeonsi = static_library( driver_radeonsi = declare_dependency( compile_args : ['-DGALLIUM_RADEONSI'] + libradeonsi_cflags, link_with : radeonsi_gfx_libs + [ - libradeonsi, libradeonwinsys, libamdgpuwinsys, libamd_common, libamd_common_llvm, libvpe, libgm, liblanczos + libradeonsi, libradeonwinsys, libamdgpuwinsys, amd_common_libs, libvpe, libgm, liblanczos ], dependencies : idep_nir, ) diff --git a/src/gallium/winsys/amdgpu/drm/meson.build b/src/gallium/winsys/amdgpu/drm/meson.build index d0306715fad..89f4db82b5a 100644 --- a/src/gallium/winsys/amdgpu/drm/meson.build +++ b/src/gallium/winsys/amdgpu/drm/meson.build @@ -15,10 +15,10 @@ libamdgpuwinsys = static_library( ), include_directories : [ inc_amd, inc_gallium, inc_gallium_aux, inc_include, inc_src, - inc_amd_common, inc_amd_common_llvm, inc_virtio_gpu + inc_amd_common, inc_virtio_gpu ], gnu_symbol_visibility : 'hidden', link_with : libamdgpu_addrlib, - dependencies : [dep_llvm, dep_libdrm_amdgpu, idep_amd_generated_headers, idep_mesautil], + dependencies : [dep_libdrm_amdgpu, idep_amd_generated_headers, idep_mesautil], c_args : c_args )