projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intel/dump_gpu: further track mapping of BOs
[mesa.git]
/
src
/
intel
/
isl
/
meson.build
diff --git
a/src/intel/isl/meson.build
b/src/intel/isl/meson.build
index 7d3e4ffc9273bcd292bf0145892e2aec613ef438..66f19039ce2fa1e22e924c4b60facda71ec1f05f 100644
(file)
--- a/
src/intel/isl/meson.build
+++ b/
src/intel/isl/meson.build
@@
-62,9
+62,12
@@
foreach g : [['40', isl_gen4_files], ['50', []], ['60', isl_gen6_files],
isl_gen_libs += static_library(
'isl_gen@0@'.format(_gen),
[g[1], isl_gen_files, gen_xml_pack],
isl_gen_libs += static_library(
'isl_gen@0@'.format(_gen),
[g[1], isl_gen_files, gen_xml_pack],
- include_directories : [inc_common, inc_intel],
- c_args : [c_vis_args, no_override_init_args,
- '-DGEN_VERSIONx10=@0@'.format(_gen)],
+ include_directories : [inc_include, inc_src, inc_gallium, inc_intel],
+ c_args : [
+ no_override_init_args,
+ '-DGEN_VERSIONx10=@0@'.format(_gen)
+ ],
+ gnu_symbol_visibility : 'hidden',
)
endforeach
)
endforeach
@@
-87,9
+90,10
@@
isl_tiled_memcpy = static_library(
'isl_tiled_memcpy',
[files_isl_tiled_memcpy],
include_directories : [
'isl_tiled_memcpy',
[files_isl_tiled_memcpy],
include_directories : [
- inc_
common, inc_intel, inc_include
,
+ inc_
include, inc_src, inc_mesa, inc_gallium, inc_intel
,
],
],
- c_args : [c_vis_args, no_override_init_args, '-msse2'],
+ c_args : [no_override_init_args, '-msse2'],
+ gnu_symbol_visibility : 'hidden',
extra_files : ['isl_tiled_memcpy.c']
)
extra_files : ['isl_tiled_memcpy.c']
)
@@
-98,10
+102,11
@@
if with_sse41
'isl_tiled_memcpy_sse41',
[files_isl_tiled_memcpy_sse41],
include_directories : [
'isl_tiled_memcpy_sse41',
[files_isl_tiled_memcpy_sse41],
include_directories : [
- inc_
common, inc_intel, inc_include
,
+ inc_
include, inc_src, inc_mesa, inc_gallium, inc_intel
,
],
link_args : ['-Wl,--exclude-libs=ALL'],
],
link_args : ['-Wl,--exclude-libs=ALL'],
- c_args : [c_vis_args, no_override_init_args, '-msse2', sse41_args],
+ c_args : [no_override_init_args, '-msse2', sse41_args],
+ gnu_symbol_visibility : 'hidden',
extra_files : ['isl_tiled_memcpy.c']
)
else
extra_files : ['isl_tiled_memcpy.c']
)
else
@@
-122,9
+127,10
@@
libisl_files = files(
libisl = static_library(
'isl',
[libisl_files, isl_format_layout_c, genX_bits_h],
libisl = static_library(
'isl',
[libisl_files, isl_format_layout_c, genX_bits_h],
- include_directories : [inc_
common, inc_intel, inc_include
],
+ include_directories : [inc_
include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel
],
link_with : [isl_gen_libs, isl_tiled_memcpy, isl_tiled_memcpy_sse41],
link_with : [isl_gen_libs, isl_tiled_memcpy, isl_tiled_memcpy_sse41],
- c_args : [c_vis_args, no_override_init_args],
+ c_args : [no_override_init_args],
+ gnu_symbol_visibility : 'hidden',
)
if with_tests
)
if with_tests
@@
-134,7
+140,7
@@
if with_tests
'isl_surf_get_image_offset_test',
'tests/isl_surf_get_image_offset_test.c',
dependencies : [dep_m, idep_mesautil],
'isl_surf_get_image_offset_test',
'tests/isl_surf_get_image_offset_test.c',
dependencies : [dep_m, idep_mesautil],
- include_directories : [inc_
common
, inc_intel],
+ include_directories : [inc_
include, inc_src, inc_gallium
, inc_intel],
link_with : [libisl, libintel_dev],
),
suite : ['intel'],
link_with : [libisl, libintel_dev],
),
suite : ['intel'],
@@
-143,10
+149,14
@@
if with_tests
'isl_aux_info',
executable(
'isl_aux_info_test',
'isl_aux_info',
executable(
'isl_aux_info_test',
- 'tests/isl_aux_info_test.cpp',
+ [
+ 'tests/isl_aux_info_test.cpp',
+ 'isl_aux_info.c',
+ ],
dependencies : [dep_m, idep_gtest, idep_mesautil],
dependencies : [dep_m, idep_gtest, idep_mesautil],
- include_directories : [inc_common, inc_intel],
- link_with : [libisl],
+ include_directories : [inc_include, inc_src, inc_gallium, inc_intel],
+ c_args : '-DIN_UNIT_TEST',
+ cpp_args : '-DIN_UNIT_TEST',
),
suite : ['intel'],
)
),
suite : ['intel'],
)