summaryrefslogtreecommitdiffstats
path: root/src/intel/isl/meson.build
diff options
context:
space:
mode:
authorTapani Pälli <[email protected]>2018-12-17 14:17:15 +0200
committerTapani Pälli <[email protected]>2019-01-10 08:02:30 +0200
commit864cc419eb0a418827620afd42879698cb149088 (patch)
tree605050e71cb7ff460e88d35f70790169c0892891 /src/intel/isl/meson.build
parent406f603b347f554f9f796d22cb74dde48d6551d3 (diff)
intel/isl: move tiled_memcpy static libs from i965 to isl
Patch moves intel_tiled_memcpy[_sse41] libraries to isl, renames some functions and types and makes the required build system changes for meson, automake and Android. No functional changes are introduced. v2: code cleanups, move isl_get_memcpy_type to i965 (Jason) v3: move isl_mem_copy_fn to priv header, cleanups (Jason, Dylan) Signed-off-by: Tapani Pälli <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]> Reviewed-by: Dylan Baker <[email protected]> Acked-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/intel/isl/meson.build')
-rw-r--r--src/intel/isl/meson.build35
1 files changed, 34 insertions, 1 deletions
diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build
index a6374f6c4f3..79eb6686059 100644
--- a/src/intel/isl/meson.build
+++ b/src/intel/isl/meson.build
@@ -69,6 +69,39 @@ isl_format_layout_c = custom_target(
command : [prog_python, '@INPUT0@', '--csv', '@INPUT1@', '--out', '@OUTPUT@'],
)
+files_isl_tiled_memcpy = files(
+ 'isl_tiled_memcpy_normal.c'
+)
+
+files_isl_tiled_memcpy_sse41 = files(
+ 'isl_tiled_memcpy_sse41.c',
+)
+
+isl_tiled_memcpy = static_library(
+ 'isl_tiled_memcpy',
+ [files_isl_tiled_memcpy],
+ include_directories : [
+ inc_common, inc_intel, inc_drm_uapi,
+ ],
+ c_args : [c_vis_args, no_override_init_args, '-msse2'],
+ extra_files : ['isl_tiled_memcpy.c']
+)
+
+if with_sse41
+ isl_tiled_memcpy_sse41 = static_library(
+ 'isl_tiled_memcpy_sse41',
+ [files_isl_tiled_memcpy_sse41],
+ include_directories : [
+ inc_common, inc_intel, inc_drm_uapi,
+ ],
+ link_args : ['-Wl,--exclude-libs=ALL'],
+ c_args : [c_vis_args, no_override_init_args, '-msse2', sse41_args],
+ extra_files : ['isl_tiled_memcpy.c']
+ )
+else
+ isl_tiled_memcpy_sse41 = []
+endif
+
libisl_files = files(
'isl.c',
'isl.h',
@@ -83,7 +116,7 @@ libisl = static_library(
'isl',
[libisl_files, isl_format_layout_c, genX_bits_h],
include_directories : [inc_common, inc_intel, inc_drm_uapi],
- link_with : isl_gen_libs,
+ link_with : [isl_gen_libs, isl_tiled_memcpy, isl_tiled_memcpy_sse41],
c_args : [c_vis_args, no_override_init_args],
)