ac/radv: decouple radv vulkan driver and compiler from gallium

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24464>
This commit is contained in:
Yonggang Luo 2023-06-05 04:45:34 +08:00 committed by Marge Bot
parent b5401a4b0e
commit cd3ea02da0
5 changed files with 7 additions and 7 deletions

View file

@ -79,7 +79,7 @@ libamdgpu_addrlib = static_library(
'inc', 'src', 'src/core', 'src/chip/gfx9', 'src/chip/r800',
'src/chip/gfx10', 'src/chip/gfx11',
),
inc_amd_common, inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux,
inc_amd_common, inc_include, inc_src
],
cpp_args : cpp_args_addrlib,
gnu_symbol_visibility : 'hidden',

View file

@ -120,7 +120,7 @@ libamd_common = static_library(
'amd_common',
[amd_common_files, sid_tables_h, amdgfxregs_h, gfx10_format_table_c],
include_directories : [
inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, inc_mapi, inc_amd,
inc_include, inc_src, inc_compiler, inc_amd,
],
dependencies : [
dep_thread, dep_elf, dep_libdrm_amdgpu, dep_valgrind,
@ -141,7 +141,7 @@ if with_tests and not with_platform_windows
['ac_surface_modifier_test.c'],
link_with: [libamd_common, libamdgpu_addrlib],
include_directories : [
inc_amd, inc_gallium, inc_include, inc_src,
inc_amd, inc_include, inc_src,
],
dependencies: [idep_amdgfxregs_h, dep_libdrm_amdgpu, idep_mesautil],
),
@ -157,7 +157,7 @@ if with_tests and not with_platform_windows
['ac_surface_meta_address_test.c'],
link_with: [libamd_common, libamdgpu_addrlib],
include_directories : [
inc_amd, inc_gallium, inc_include, inc_src,
inc_amd, inc_include, inc_src,
],
dependencies: [idep_amdgfxregs_h, dep_libdrm_amdgpu, idep_mesautil, dep_openmp],
),

View file

@ -59,7 +59,7 @@ test(
'-DACO_TEST_PYTHON_BIN="@0@"'.format(prog_python.full_path())] +
cpp_args_aco,
include_directories : [
inc_include, inc_src, inc_compiler, inc_mesa, inc_mapi, inc_amd, inc_amd_common, inc_amd_common_llvm,
inc_include, inc_src, inc_compiler, inc_amd, inc_amd_common, inc_amd_common_llvm,
],
link_with : [
libamd_common, libamd_common_llvm, libvulkan_radeon,

View file

@ -33,7 +33,7 @@ libamd_common_llvm = static_library(
'amd_common_llvm',
[amd_common_llvm_files],
include_directories : [
inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, inc_amd, inc_amd_common
inc_include, inc_src, inc_compiler, inc_amd, inc_amd_common
],
link_with: [
libamd_common

View file

@ -194,7 +194,7 @@ libvulkan_radeon = shared_library(
[libradv_files, radv_entrypoints, sha1_h, radix_sort_spv, bvh_spv],
vs_module_defs : vulkan_api_def,
include_directories : [
inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util,
inc_include, inc_src, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util,
],
link_with : [
libamd_common, libamd_common_llvm, libamdgpu_addrlib,