diff options
| author | Dylan Baker <[email protected]> | 2019-01-28 16:07:20 -0800 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-10-10 16:33:04 -0700 |
| commit | 1e2c05b82af9ba64430de8fca80e602b2e19f337 (patch) | |
| tree | c12ef4b9e89f9dd812942d1ab3cc0e1996f8fc6d | |
| parent | 63f5aee69443049926e9e853daac7be79a87dcbe (diff) | |
meson: add msvc compat args to swr
This has always been present in the scons build, so it should be in
the meson build as well.
Acked-by: Eric Engestrom <[email protected]>
Acked-by: Kristian H. Kristensen <[email protected]>
| -rw-r--r-- | src/gallium/drivers/swr/meson.build | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build index 416ac6fdd23..2fad60365a3 100644 --- a/src/gallium/drivers/swr/meson.build +++ b/src/gallium/drivers/swr/meson.build @@ -205,7 +205,10 @@ if with_swr_arches.contains('avx') swr_arch_libs += shared_library( 'swrAVX', [files_swr_common, files_swr_arch], - cpp_args : [swr_cpp_args, swr_avx_args, '-DKNOB_ARCH=KNOB_ARCH_AVX'], + cpp_args : [ + cpp_msvc_compat_args, swr_cpp_args, swr_avx_args, + '-DKNOB_ARCH=KNOB_ARCH_AVX', + ], link_args : [ld_args_gc_sections], include_directories : [swr_incs], dependencies : [dep_thread, dep_llvm], @@ -231,7 +234,10 @@ if with_swr_arches.contains('avx2') swr_arch_libs += shared_library( 'swrAVX2', [files_swr_common, files_swr_arch], - cpp_args : [swr_cpp_args, swr_avx2_args, '-DKNOB_ARCH=KNOB_ARCH_AVX2'], + cpp_args : [ + cpp_msvc_compat_args, swr_cpp_args, swr_avx2_args, + '-DKNOB_ARCH=KNOB_ARCH_AVX2', + ], link_args : [ld_args_gc_sections], include_directories : [swr_incs], dependencies : [dep_thread, dep_llvm], @@ -254,8 +260,8 @@ if with_swr_arches.contains('knl') 'swrKNL', [files_swr_common, files_swr_arch], cpp_args : [ - swr_cpp_args, swr_knl_args, '-DKNOB_ARCH=KNOB_ARCH_AVX512', - '-DSIMD_ARCH_KNIGHTS', + cpp_msvc_compat_args, swr_cpp_args, swr_knl_args, + '-DKNOB_ARCH=KNOB_ARCH_AVX512', '-DSIMD_ARCH_KNIGHTS', ], link_args : [ld_args_gc_sections], include_directories : [swr_incs], @@ -278,7 +284,10 @@ if with_swr_arches.contains('skx') swr_arch_libs += shared_library( 'swrSKX', [files_swr_common, files_swr_arch], - cpp_args : [swr_cpp_args, swr_skx_args, '-DKNOB_ARCH=KNOB_ARCH_AVX512'], + cpp_args : [ + cpp_msvc_compat_args, swr_cpp_args, swr_skx_args, + '-DKNOB_ARCH=KNOB_ARCH_AVX512', + ], link_args : [ld_args_gc_sections], include_directories : [swr_incs], dependencies : [dep_thread, dep_llvm], @@ -297,7 +306,10 @@ libmesaswr = static_library( 'mesaswr', [files_swr_mesa, files_swr_common, gen_knobs_h, gen_knobs_cpp, gen_builder_hpp, gen_builder_meta_hpp, gen_builder_intrin_hpp], - cpp_args : [cpp_vis_args, swr_cpp_args, swr_avx_args, swr_arch_defines], + cpp_args : [ + cpp_msvc_compat_args, cpp_vis_args, swr_cpp_args, swr_avx_args, + swr_arch_defines, + ], include_directories : [inc_common, swr_incs], dependencies : dep_llvm, ) |