Module: Mesa Branch: main Commit: 84db4d56985da274a3c6007ad24f219437db3469 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=84db4d56985da274a3c6007ad24f219437db3469
Author: Yonggang Luo <luoyongg...@gmail.com> Date: Wed Nov 1 03:22:44 2023 +0800 micosoft: decouple microsoft vulkan driver and compiler from gallium Signed-off-by: Yonggang Luo <luoyongg...@gmail.com> Acked-by: Jesse Natalie <jenat...@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24440> --- src/microsoft/clc/meson.build | 2 +- src/microsoft/compiler/meson.build | 2 +- src/microsoft/spirv_to_dxil/meson.build | 4 ++-- src/microsoft/vulkan/meson.build | 5 +---- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/microsoft/clc/meson.build b/src/microsoft/clc/meson.build index 4c56dd30130..cf73c1a9ae5 100644 --- a/src/microsoft/clc/meson.build +++ b/src/microsoft/clc/meson.build @@ -28,7 +28,7 @@ libclc_compiler = shared_library( 'clon12compiler', [files_libclc_compiler, sha1_h], vs_module_defs : 'clon12compiler.def', - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_spirv], + include_directories : [inc_include, inc_src, inc_spirv], dependencies: [idep_mesaclc, idep_nir_headers, dep_version, idep_mesautil, idep_libdxil_compiler, idep_nir, idep_vtn], name_prefix : '' # otherwise mingw will create libclon12compiler.dll diff --git a/src/microsoft/compiler/meson.build b/src/microsoft/compiler/meson.build index 8ea239bca78..fc814c90a76 100644 --- a/src/microsoft/compiler/meson.build +++ b/src/microsoft/compiler/meson.build @@ -53,7 +53,7 @@ dxil_nir_algebraic_c = custom_target( libdxil_compiler = static_library( 'dxil_compiler', [files_libdxil_compiler, dxil_nir_algebraic_c, sha1_h], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium], + include_directories : [inc_include, inc_src], dependencies: [idep_nir_headers, dep_valgrind], gnu_symbol_visibility : 'hidden', ) diff --git a/src/microsoft/spirv_to_dxil/meson.build b/src/microsoft/spirv_to_dxil/meson.build index eb74b06ff9e..7a75e267760 100644 --- a/src/microsoft/spirv_to_dxil/meson.build +++ b/src/microsoft/spirv_to_dxil/meson.build @@ -33,7 +33,7 @@ libspirv_to_dxil = both_libraries( ], vs_module_defs : 'spirv_to_dxil.def', dependencies : [idep_nir, idep_vtn, idep_libdxil_compiler], - include_directories : [inc_include, inc_src, inc_gallium], + include_directories : [inc_include, inc_src], install : true, ) @@ -48,7 +48,7 @@ spirv_to_dxil = executable( 'spirv2dxil.c', ), dependencies : [idep_nir, idep_libdxil_compiler, idep_getopt, idep_libspirv_to_dxil], - include_directories : [inc_include, inc_src, inc_gallium], + include_directories : [inc_include, inc_src], build_by_default : true, install : true, ) diff --git a/src/microsoft/vulkan/meson.build b/src/microsoft/vulkan/meson.build index 3be471f2405..0c7e2d42568 100644 --- a/src/microsoft/vulkan/meson.build +++ b/src/microsoft/vulkan/meson.build @@ -81,10 +81,7 @@ libvulkan_dzn = shared_library( 'vulkan_dzn', [libdzn_files, dzn_entrypoints, sha1_h], vs_module_defs : vulkan_api_def, - include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, - inc_util - ], + include_directories : [inc_include, inc_src, inc_util], dependencies : [dzn_deps, idep_vulkan_wsi, idep_xmlconfig], c_args : dzn_flags, cpp_args : dzn_cpp_flags,
