diff options
| author | Tapani Pälli <[email protected]> | 2018-12-17 14:17:15 +0200 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2019-01-10 08:02:30 +0200 |
| commit | 864cc419eb0a418827620afd42879698cb149088 (patch) | |
| tree | 605050e71cb7ff460e88d35f70790169c0892891 /src/intel/Makefile.isl.am | |
| parent | 406f603b347f554f9f796d22cb74dde48d6551d3 (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/Makefile.isl.am')
| -rw-r--r-- | src/intel/Makefile.isl.am | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/intel/Makefile.isl.am b/src/intel/Makefile.isl.am index f51294468cd..a6733f3ba8e 100644 --- a/src/intel/Makefile.isl.am +++ b/src/intel/Makefile.isl.am @@ -31,11 +31,26 @@ ISL_GEN_LIBS = \ isl/libisl-gen11.la \ $(NULL) -noinst_LTLIBRARIES += $(ISL_GEN_LIBS) isl/libisl.la +noinst_LTLIBRARIES += $(ISL_GEN_LIBS) \ + isl/libisl.la \ + libisl_tiled_memcpy.la \ + libisl_tiled_memcpy_sse41.la + +isl_libisl_la_LIBADD = $(ISL_GEN_LIBS) \ + libisl_tiled_memcpy.la \ + libisl_tiled_memcpy_sse41.la -isl_libisl_la_LIBADD = $(ISL_GEN_LIBS) isl_libisl_la_SOURCES = $(ISL_FILES) $(ISL_GENERATED_FILES) +libisl_tiled_memcpy_la_SOURCES = $(ISL_TILED_MEMCPY_FILES) +libisl_tiled_memcpy_la_CFLAGS = $(AM_CFLAGS) + +libisl_tiled_memcpy_sse41_la_SOURCES = $(ISL_TILED_MEMCPY_SSE41_FILES) +libisl_tiled_memcpy_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS) + +isl_tiled_memcpy_normal.c: $(ISL_TILED_MEMCPY_DEP_FILES) +isl_tiled_memcpy_sse41.c: $(ISL_TILED_MEMCPY_DEP_FILES) + isl_libisl_gen4_la_SOURCES = $(ISL_GEN4_FILES) isl_libisl_gen4_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=40 @@ -90,4 +105,5 @@ isl_tests_isl_surf_get_image_offset_test_LDADD = \ EXTRA_DIST += \ isl/gen_format_layout.py \ isl/isl_format_layout.csv \ - isl/README + isl/README \ + $(ISL_TILED_MEMCPY_DEP_FILES) |