diff options
author | George Kyriazis <[email protected]> | 2018-01-31 21:44:54 -0600 |
---|---|---|
committer | George Kyriazis <[email protected]> | 2018-02-02 17:43:00 -0600 |
commit | 16bf8138308008f4b889caa827a8291ff72745b8 (patch) | |
tree | 1ef24231aaae4279b6830b9cfc1e82b41bcab0e3 /src/gallium/drivers/swr/meson.build | |
parent | 3bf1e036e8ad196fe669ac24da8c14ff160399d8 (diff) |
meson/swr: re-shuffle generated files
Move generated files from codegen/meson.build to other directories, in order
to satisfy generated include file dependencies
Add correct file lists for architecture-specific libraries.
cc: [email protected]
cc: [email protected]
Reviewed-by: Dylan Baker <[email protected]>
Diffstat (limited to 'src/gallium/drivers/swr/meson.build')
-rw-r--r-- | src/gallium/drivers/swr/meson.build | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build index ae86c8ec380..4d6af87af08 100644 --- a/src/gallium/drivers/swr/meson.build +++ b/src/gallium/drivers/swr/meson.build @@ -151,7 +151,22 @@ files_swr_arch = files( swr_context_files = files('swr_context.h') swr_state_files = files('rasterizer/core/state.h') swr_event_proto_files = files('rasterizer/archrast/events.proto') +swr_gen_backend_files = files('rasterizer/codegen/templates/gen_backend.cpp') +swr_gen_rasterizer_files = files('rasterizer/codegen/templates/gen_rasterizer.cpp') +swr_gen_header_init_files = files('rasterizer/codegen/templates/gen_header_init.hpp') + +swr_gen_llvm_ir_macros_py = files('rasterizer/codegen/gen_llvm_ir_macros.py') +swr_gen_backends_py = files('rasterizer/codegen/gen_backends.py') + +swr_gen_builder_depends = files( + 'rasterizer/codegen/templates/gen_builder.hpp', + 'rasterizer/codegen/gen_common.py' + ) + + +subdir('rasterizer/jitter') subdir('rasterizer/codegen') +subdir('rasterizer/core/backends') swr_incs = include_directories( 'rasterizer/codegen', 'rasterizer/core', 'rasterizer/jitter', @@ -180,7 +195,7 @@ if with_swr_arches.contains('avx') swr_arch_defines += '-DHAVE_SWR_AVX' swr_arch_libs += shared_library( 'swrAVX', - files_swr_common, + [files_swr_common, files_swr_arch], cpp_args : [swr_cpp_args, swr_avx_args, '-DKNOB_ARCH=KNOB_ARCH_AVX'], link_args : [ld_args_gc_sections], include_directories : [swr_incs], @@ -212,7 +227,7 @@ if with_swr_arches.contains('avx2') swr_arch_defines += '-DHAVE_SWR_AVX2' swr_arch_libs += shared_library( 'swrAVX2', - files_swr_common, + [files_swr_common, files_swr_arch], cpp_args : [swr_cpp_args, swr_avx2_args, '-DKNOB_ARCH=KNOB_ARCH_AVX2'], link_args : [ld_args_gc_sections], include_directories : [swr_incs], @@ -236,7 +251,7 @@ if with_swr_arches.contains('knl') swr_arch_defines += '-DHAVE_SWR_KNL' swr_arch_libs += shared_library( 'swrKNL', - files_swr_common, + [files_swr_common, files_swr_arch], cpp_args : [ swr_cpp_args, swr_knl_args, '-DKNOB_ARCH=KNOB_ARCH_AVX512', '-DKNOB_ARCH_KNIGHTS', @@ -263,7 +278,7 @@ if with_swr_arches.contains('skx') swr_arch_defines += '-DHAVE_SWR_SKX' swr_arch_libs += shared_library( 'swrSKX', - files_swr_common, + [files_swr_common, files_swr_arch], cpp_args : [swr_cpp_args, swr_skx_args, '-DKNOB_ARCH=KNOB_ARCH_AVX512'], link_args : [ld_args_gc_sections], include_directories : [swr_incs], |