OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: use gnu_symbol_visibility argument

Browse Source 
This uses a meson builtin to handle -fvisibility=hidden. This is nice
because we don't need to track which languages are used, if C++ is
suddenly added meson just does the right thing.

Acked-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4740>
This commit is contained in:
Dylan Baker
2020-04-24 13:10:41 -07:00
committed by Marge Bot
parent fc7301865e
commit a8e2d79e02
130 changed files with 339 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/compiler/glsl/glcpp/meson.build
View File

@@ -50,8 +50,9 @@ libglcpp = static_library(
[glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c')],
dependencies : idep_mesautil,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args, _extra_args],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _extra_args],
c_args : [no_override_init_args, c_msvc_compat_args, _extra_args],
cpp_args : [cpp_msvc_compat_args, _extra_args],
gnu_symbol_visibility : 'hidden',
build_by_default : false,
)
@@ -60,8 +61,9 @@ libglcpp_standalone = static_library(
'pp_standalone_scaffolding.c',
link_with : libglcpp,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args, _extra_args],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _extra_args],
c_args : [no_override_init_args, c_msvc_compat_args, _extra_args],
cpp_args : [cpp_msvc_compat_args, _extra_args],
gnu_symbol_visibility : 'hidden',
build_by_default : false,
)
@@ -71,7 +73,8 @@ glcpp = executable(
dependencies : [dep_m, idep_getopt],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
link_with : [libglcpp_standalone, libglsl_util],
c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args],
c_args : [no_override_init_args, c_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
build_by_default : false,
)

20
src/compiler/glsl/meson.build
View File

@@ -227,8 +227,9 @@ libglsl = static_library(
[files_libglsl, glsl_parser, glsl_lexer_cpp, ir_expression_operation_h,
ir_expression_operation_strings_h, ir_expression_operation_constant_h,
float64_glsl_h],
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
c_args : [c_msvc_compat_args, no_override_init_args],
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
link_with : libglcpp,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler],
dependencies : idep_nir,
@@ -238,8 +239,9 @@ libglsl = static_library(
libglsl_standalone = static_library(
'glsl_standalone',
[files_libglsl_standalone, ir_expression_operation_h],
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
c_args : [c_msvc_compat_args, no_override_init_args],
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
link_with : [libglsl, libglsl_util, libglcpp_standalone],
dependencies : [idep_mesautil, idep_getopt],
@@ -249,8 +251,9 @@ libglsl_standalone = static_library(
glsl_compiler = executable(
'glsl_compiler',
'main.cpp',
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
c_args : [c_msvc_compat_args, no_override_init_args],
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
dependencies : [dep_clock, dep_thread, idep_getopt],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
link_with : [libglsl_standalone],
@@ -262,8 +265,9 @@ glsl_test = executable(
'glsl_test',
['test.cpp', 'test_optpass.cpp', 'test_optpass.h',
ir_expression_operation_h],
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
c_args : [c_msvc_compat_args, no_override_init_args],
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : [dep_clock, dep_thread, idep_getopt],
link_with : [libglsl, libglsl_standalone, libglsl_util],

15
src/compiler/glsl/tests/meson.build
View File

@@ -24,7 +24,8 @@ if with_shader_cache
executable(
'cache_test',
'cache_test.c',
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
c_args : [c_msvc_compat_args, no_override_init_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
link_with : [libglsl],
dependencies : [dep_clock, dep_thread],
@@ -41,7 +42,8 @@ test(
'invalidate_locations_test.cpp', 'general_ir_test.cpp',
'lower_int64_test.cpp', 'opt_add_neg_to_sub_test.cpp',
'varyings_test.cpp', ir_expression_operation_h],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
link_with : [libglsl, libglsl_standalone, libglsl_util],
dependencies : [dep_clock, dep_thread, idep_gtest],
@@ -56,7 +58,8 @@ test(
['copy_constant_to_storage_tests.cpp', 'set_uniform_initializer_tests.cpp',
'uniform_initializer_utils.cpp', 'uniform_initializer_utils.h',
ir_expression_operation_h],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
link_with : [libglsl, libglsl_util],
dependencies : [dep_thread, idep_gtest],
@@ -69,7 +72,8 @@ test(
executable(
'sampler_types_test',
['sampler_types_test.cpp', ir_expression_operation_h],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
link_with : [libglsl, libglsl_util],
dependencies : [dep_thread, idep_gtest],
@@ -82,7 +86,8 @@ test(
executable(
'list_iterators',
['list_iterators.cpp'],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_glsl],
link_with : [libglsl, libglsl_util],
dependencies : [dep_thread, idep_gtest],

8
src/compiler/meson.build
View File

@@ -45,8 +45,9 @@ libcompiler = static_library(
'compiler',
[files_libcompiler, ir_expression_operation_h],
include_directories : [inc_mapi, inc_mesa, inc_compiler, inc_include, inc_src, inc_gallium, inc_gallium_aux],
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
c_args : [c_msvc_compat_args, no_override_init_args],
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
dependencies : [dep_valgrind],
build_by_default : false,
)
@@ -62,7 +63,8 @@ spirv2nir = executable(
files('spirv/spirv2nir.c'),
dependencies : [dep_m, idep_nir, idep_mesautil],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, include_directories('spirv')],
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
c_args : [c_msvc_compat_args, no_override_init_args],
gnu_symbol_visibility : 'hidden',
build_by_default : with_tools.contains('nir'),
install : with_tools.contains('nir'),
)

24
src/compiler/nir/meson.build
View File

@@ -258,7 +258,8 @@ _libnir = static_library(
nir_opcodes_h, nir_constant_expressions_c, nir_builder_opcodes_h,
vtn_gather_types_c, nir_intrinsics_c, nir_intrinsics_h],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, include_directories('../spirv')],
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
c_args : [c_msvc_compat_args, no_override_init_args],
gnu_symbol_visibility : 'hidden',
link_with : libcompiler,
build_by_default : false,
)
@@ -283,7 +284,8 @@ if with_tests
executable(
'nir_builder_test',
files('tests/builder_tests.cpp'),
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
),
@@ -295,7 +297,8 @@ if with_tests
executable(
'nir_control_flow_test',
files('tests/control_flow_tests.cpp'),
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
),
@@ -307,7 +310,8 @@ if with_tests
executable(
'nir_vars_test',
files('tests/vars_tests.cpp'),
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
),
@@ -328,7 +332,8 @@ if with_tests
executable(
'negative_equal',
files('tests/negative_equal_tests.cpp'),
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
c_args : [c_msvc_compat_args, no_override_init_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
),
@@ -340,7 +345,8 @@ if with_tests
executable(
'comparison_pre',
files('tests/comparison_pre_tests.cpp'),
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
c_args : [c_msvc_compat_args, no_override_init_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
),
@@ -352,7 +358,8 @@ if with_tests
executable(
'load_store_vectorizer',
files('tests/load_store_vectorizer_tests.cpp'),
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
),
@@ -365,7 +372,8 @@ if with_tests
executable(
'nir_serialize_test',
files('tests/serialize_tests.cpp'),
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
),