summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/meson.build23
-rw-r--r--src/mesa/drivers/dri/meson.build11
2 files changed, 21 insertions, 13 deletions
diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build
index 0a214a0d8be..e3bf9cc51bb 100644
--- a/src/mesa/drivers/dri/i965/meson.build
+++ b/src/mesa/drivers/dri/i965/meson.build
@@ -140,8 +140,10 @@ foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '100']
'libi965_gen@0@'.format(v),
['genX_blorp_exec.c', 'genX_state_upload.c', nir_opcodes_h, gen_xml_pack],
include_directories : [inc_common, inc_intel, inc_dri_common],
- c_args : [c_vis_args, no_override_init_args, '-msse2',
- '-DGEN_VERSIONx10=@0@'.format(v)],
+ c_args : [
+ c_vis_args, no_override_init_args, '-msse2',
+ '-DGEN_VERSIONx10=@0@'.format(v),
+ ],
dependencies : [dep_libdrm],
)
i965_gen_libs += _lib
@@ -149,9 +151,10 @@ endforeach
oa_generator = generator(
prog_python2,
- arguments : ['@CURRENT_SOURCE_DIR@/brw_oa.py', '@INPUT@',
- '--chipset', '@EXTRA_ARGS@', '--code', '@OUTPUT0@',
- '--header', '@OUTPUT1@'],
+ arguments : [
+ '@CURRENT_SOURCE_DIR@/brw_oa.py', '@INPUT@', '--chipset', '@EXTRA_ARGS@',
+ '--code', '@OUTPUT0@', '--header', '@OUTPUT1@',
+ ],
)
@@ -166,12 +169,14 @@ libi965 = static_library(
'i965',
[files_i965, i965_oa_sources, nir_opcodes_h, ir_expression_operation_h,
xmlpool_options_h],
- include_directories : [inc_common, inc_intel, inc_dri_common, inc_util,
- inc_drm_uapi, inc_nir],
+ include_directories : [
+ inc_common, inc_intel, inc_dri_common, inc_util, inc_drm_uapi, inc_nir,
+ ],
c_args : [c_vis_args, no_override_init_args, '-msse2'],
cpp_args : [cpp_vis_args, '-msse2'],
- link_with : [i965_gen_libs, libintel_common, libisl, libintel_compiler,
- libblorp],
+ link_with : [
+ i965_gen_libs, libintel_common, libisl, libintel_compiler, libblorp,
+ ],
dependencies : [dep_libdrm, dep_valgrind],
)
diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
index 4ec2f343df2..e73ee39381e 100644
--- a/src/mesa/drivers/dri/meson.build
+++ b/src/mesa/drivers/dri/meson.build
@@ -46,10 +46,13 @@ if dri_drivers != []
'mesa_dri_drivers',
dummy_cpp, # see meson #2180
link_whole : dri_drivers,
- link_with : [libmegadriver_stub, libdricommon, libxmlconfig, libglapi,
- libmesa_util, libnir, libmesa_classic],
- dependencies : [dep_selinux, dep_libdrm, dep_expat, dep_m, dep_thread,
- dep_dl],
+ link_with : [
+ libmegadriver_stub, libdricommon, libxmlconfig, libglapi, libmesa_util,
+ libnir, libmesa_classic,
+ ],
+ dependencies : [
+ dep_selinux, dep_libdrm, dep_expat, dep_m, dep_thread, dep_dl,
+ ],
link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic, ld_args_gc_sections],
)