fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-01 03:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

meson: Use sse2_arg and sse2_args to replace usage of c and c_sse2_args

Browse source 
And now c_sse2_arg and c_sse2_args are remvoed

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21375>
This commit is contained in:
Yonggang Luo 2023-02-17 14:45:08 +08:00 • committed by Marge Bot
parent ddf708a1ff
commit 669a68489d
9 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/crocus/meson.build
View file

@ -60,7 +60,7 @@ foreach v : ['40', '45', '50', '60', '70', '75', '80']
['crocus_blorp.c', 'crocus_query.c', 'crocus_state.c', 'crocus_blt.c', gen_xml_pack],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
c_args : [
no_override_init_args, c_sse2_args,
no_override_init_args, sse2_args,
'-DGFX_VERx10=@0@'.format(v),
],
gnu_symbol_visibility : 'hidden',
@ -77,8 +77,8 @@ libcrocus = static_library(
# these should not be necessary, but main/macros.h...
inc_mesa, inc_mapi
],
c_args : [c_sse2_args],
cpp_args : [c_sse2_args],
c_args : [sse2_args],
cpp_args : [sse2_args],
gnu_symbol_visibility : 'hidden',
dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_libintel_common, idep_nir_headers],
link_with : [

6
src/gallium/drivers/iris/meson.build
View file

@ -65,7 +65,7 @@ foreach v : ['80', '90', '110', '120', '125']
['iris_blorp.c', 'iris_query.c', 'iris_state.c', gen_xml_pack],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
c_args : [
no_override_init_args, c_sse2_args,
no_override_init_args, sse2_args,
'-DGFX_VERx10=@0@'.format(v),
],
gnu_symbol_visibility : 'hidden',
@ -83,8 +83,8 @@ libiris = static_library(
# these should not be necessary, but main/macros.h...
inc_mesa, inc_mapi
],
c_args : [c_sse2_args],
cpp_args : [c_sse2_args],
c_args : [sse2_args],
cpp_args : [sse2_args],
gnu_symbol_visibility : 'hidden',
dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_nir_headers,
idep_libintel_common, idep_intel_driver_ds, ],

4
src/intel/isl/meson.build
View file

@ -101,7 +101,7 @@ isl_tiled_memcpy = static_library(
inc_include, inc_src, inc_mesa, inc_gallium, inc_intel,
],
dependencies : idep_mesautil,
c_args : [no_override_init_args, c_sse2_arg],
c_args : [no_override_init_args, sse2_arg],
gnu_symbol_visibility : 'hidden',
extra_files : ['isl_tiled_memcpy.c']
)
@ -115,7 +115,7 @@ if with_sse41
],
dependencies : idep_mesautil,
link_args : ['-Wl,--exclude-libs=ALL'],
c_args : [no_override_init_args, c_sse2_arg, sse41_args],
c_args : [no_override_init_args, sse2_arg, sse41_args],
gnu_symbol_visibility : 'hidden',
extra_files : ['isl_tiled_memcpy.c']
)

6
src/intel/meson.build
View file

@ -18,12 +18,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
c_sse2_args = []
c_sse2_arg = []
if ['x86', 'x86_64'].contains(host_machine.cpu_family())
c_sse2_arg = ['-msse2', '-mfpmath=sse']
c_sse2_args = [c_sse2_arg, '-mstackrealign']
endif
inc_intel = include_directories('.')
subdir('genxml')

4
src/intel/perf/meson.build
View file

@ -39,8 +39,8 @@ libintel_perf = static_library(
include_directories : [
inc_include, inc_src, inc_intel,
],
c_args : [no_override_init_args, c_sse2_arg],
cpp_args : [c_sse2_arg],
c_args : [no_override_init_args, sse2_arg],
cpp_args : [sse2_arg],
gnu_symbol_visibility : 'hidden',
)

2
src/intel/tools/meson.build
View file

@ -96,7 +96,7 @@ libintel_sanitize_gpu = shared_library(
dependencies : [idep_mesautil, dep_dl, dep_thread],
include_directories : [inc_include, inc_src, inc_intel],
link_with : libintel_common,
c_args : [no_override_init_args, c_sse2_args],
c_args : [no_override_init_args, sse2_args],
gnu_symbol_visibility : 'hidden',
install_dir : get_option('libexecdir'),
install : true

4
src/intel/vulkan/grl/meson.build
View file

@ -165,11 +165,11 @@ foreach t : [['125', 'gfx125', 'dg2']]
inc_intel,
],
c_args : [
no_override_init_args, c_sse2_args,
no_override_init_args, sse2_args,
'-DGFX_VERx10=@0@'.format(verX10),
],
cpp_args : [
no_override_init_args, c_sse2_args,
no_override_init_args, sse2_args,
'-DGFX_VERx10=@0@'.format(verX10),
],
dependencies : [

4
src/intel/vulkan/meson.build
View file

@ -24,7 +24,7 @@ inc_anv = include_directories('.')
anv_flags = [
no_override_init_args,
c_sse2_args,
sse2_args,
]
anv_cpp_flags = []
@ -281,7 +281,7 @@ if with_tests
executable(
t,
['tests/@0@.c'.format(t), anv_entrypoints[0]],
c_args : [ c_sse2_args ],
c_args : [ sse2_args ],
link_with : libvulkan_intel_test,
dependencies : [
dep_libdrm, dep_thread, dep_m, dep_valgrind,

6
src/intel/vulkan_hasvk/meson.build
View file

@ -84,7 +84,7 @@ foreach g : [['70', ['gfx7_cmd_buffer.c']],
inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_compiler, inc_intel,
],
c_args : [
no_override_init_args, c_sse2_args,
no_override_init_args, sse2_args,
'-DGFX_VERx10=@0@'.format(_gfx_ver),
],
gnu_symbol_visibility : 'hidden',
@ -138,7 +138,7 @@ anv_deps = [
]
anv_flags = [
no_override_init_args,
c_sse2_args,
sse2_args,
]
anv_cpp_flags = []
@ -243,7 +243,7 @@ if with_tests
executable(
t,
['tests/@0@.c'.format(t), anv_hasvk_entrypoints[0]],
c_args : [ c_sse2_args ],
c_args : [ sse2_args ],
link_with : libvulkan_intel_hasvk_test,
dependencies : [
dep_libdrm, dep_thread, dep_m, dep_valgrind,