dsg/mesa
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

r600: remove LLVM dependency

Browse source 
r600 doesn't use LLVM anymore. Remove the remaining print of the version
number and the dependencies in the build system.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39071>
This commit is contained in:
Michael Tretter 2025-12-22 15:14:50 +01:00 • committed by Marge Bot
parent 8c4d824e39
commit ebf1454410
4 changed files with 5 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -229,7 +229,6 @@ with_llvm = with_llvm \
.enable_if(with_gallium_i915, error_message : 'i915 Gallium driver requires LLVM for vertex shaders') \
.enable_if(with_gallium_llvmpipe, error_message : 'LLVMPipe Gallium driver requires LLVM') \
.enable_if(with_gallium_r300 and draw_with_llvm, error_message : 'R300 Gallium driver requires LLVM for vertex shaders on IGP parts') \
.enable_if(with_gallium_r600 and amd_with_llvm, error_message : 'R600 Gallium driver configured to require LLVM') \
.enable_if(with_gallium_radeonsi and amd_with_llvm, error_message : 'RadeonSI Gallium driver configured to require LLVM')
# compatibility for "swrast" as an internal-ish driver name
@ -1781,11 +1780,8 @@ 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
if with_amd_vk or with_gallium_radeonsi
llvm_modules += ['amdgpu', 'bitreader', 'ipo']
if with_gallium_r600
llvm_modules += 'asmparser'
endif
endif
if with_clc
llvm_modules += ['coverage', 'target', 'linker', 'irreader', 'option', 'libdriver', 'lto']

2
src/gallium/drivers/r600/meson.build
View file

@ -174,7 +174,7 @@ libr600 = static_library(
inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common,
inc_gallium_drivers,
],
dependencies: [dep_llvm, idep_nir, idep_nir_headers, idep_mesautil],
dependencies: [idep_nir, idep_nir_headers, idep_mesautil],
)
driver_r600 = declare_dependency(

10
src/gallium/drivers/r600/r600_pipe_common.c
View file

@ -21,10 +21,6 @@
#include <sys/utsname.h>
#include <stdlib.h>
#if AMD_LLVM_AVAILABLE
#include <llvm-c/TargetMachine.h>
#endif
struct r600_multi_fence {
struct pipe_reference reference;
struct pipe_fence_handle *gfx;
@ -989,11 +985,7 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
" / %s", uname_data.release);
snprintf(rscreen->renderer_string, sizeof(rscreen->renderer_string),
"%s (%sDRM %i.%i.%i%s"
#if AMD_LLVM_AVAILABLE
", LLVM " MESA_LLVM_VERSION_STRING
#endif
")",
"%s (%sDRM %i.%i.%i%s)",
chip_name, family_name, rscreen->info.drm_major,
rscreen->info.drm_minor, rscreen->info.drm_patchlevel,
kernel_version);

6
src/gallium/drivers/r600/sfn/tests/meson.build
View file

@ -4,8 +4,7 @@ r600_test_lib = static_library('r600_test', 'sfn_test_shaders.cpp',
include_directories : [ inc_src, inc_include,
inc_gallium, inc_gallium_aux, inc_amd_common,
inc_gallium_drivers, ],
dependencies : [idep_gtest, dep_thread, dep_llvm, idep_nir,
idep_nir_headers, idep_mesautil],
dependencies : [idep_gtest, dep_thread, idep_nir, idep_nir_headers, idep_mesautil],
)
@ -14,8 +13,7 @@ r600_test_dep = declare_dependency(
inc_gallium, inc_gallium_aux, inc_amd_common,
inc_gallium_drivers, ],
link_with : [ libr600, libmesa, libgalliumvl, libgallium, libradeonwinsys, r600_test_lib],
dependencies : [idep_gtest, dep_thread, dep_llvm, idep_nir,
idep_nir_headers, idep_mesautil]
dependencies : [idep_gtest, dep_thread, idep_nir, idep_nir_headers, idep_mesautil]
)