diff options
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/meson.build | 2 | ||||
| -rw-r--r-- | src/gallium/meson.build | 3 | ||||
| -rw-r--r-- | src/gallium/targets/dri/meson.build | 89 |
4 files changed, 93 insertions, 5 deletions
diff --git a/meson.build b/meson.build index e2f49415295..e0fac4858fc 100644 --- a/meson.build +++ b/meson.build @@ -540,8 +540,8 @@ if dep_thread.found() and host_machine.system() == 'linux' pre_args += '-DHAVE_PTHREAD' endif dep_elf = dependency('libelf', required : false) -if not dep_elf.found() - dep_elf = cc.find_library('elf', required : with_amd_vk) # TODO: clover, r600, radeonsi +if not dep_elf.found() and (with_amd_vk or with_gallium_radeonsi) # TODO: clover, r600 + dep_elf = cc.find_library('elf') endif dep_expat = dependency('expat') # this only exists on linux so either this is linux and it will be found, or diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build index 08e855d75b5..b0089c0d56e 100644 --- a/src/gallium/drivers/radeonsi/meson.build +++ b/src/gallium/drivers/radeonsi/meson.build @@ -66,7 +66,7 @@ si_driinfo_h = custom_target( libradeonsi = static_library( 'radeonsi', - [files_libradeonsi, si_driinfo_h, nir_opcodes_h], + [files_libradeonsi, si_driinfo_h, nir_opcodes_h, sid_tables_h], include_directories : [ inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common, inc_gallium_drivers, diff --git a/src/gallium/meson.build b/src/gallium/meson.build index d500cf5493c..6c0e9782ae9 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -54,9 +54,8 @@ subdir('state_trackers/dri') # TODO: winsys/sw/xlib # TODO: clover if with_dri - #subdir('targets/dri') + subdir('targets/dri') endif -# TODO: dricommon # TODO: xlib-glx # TODO: OMX # TODO: osmesa diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build new file mode 100644 index 00000000000..6f0986af39e --- /dev/null +++ b/src/gallium/targets/dri/meson.build @@ -0,0 +1,89 @@ +# Copyright © 2017 Dylan Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +# TODO: support non-static targets +# Static targets are always enabled in autotools (unless you modify +# configure.ac) + +gallium_dri_c_args = [ + '-DGALLIUM_DDEBUG', + '-DGALLIUM_NOOP', + '-DGALLIUM_RBUG', + '-DGALLIUME_TRACE', +] +gallium_dri_ld_args = [] +gallium_dri_link_with = [] +gallium_dri_depends = [] +gallium_dri_link_depends = [] +gallium_dri_drivers = [] +gallium_dri_sources = [] + +if with_ld_version_script + gallium_dri_ld_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'dri.sym')] + gallium_dri_link_depends += files('dri.sym') +endif +if with_ld_dynamic_list + gallium_dri_ld_args += ['-Wl,--dynamic-list', join_paths(meson.current_source_dir(), '../dri-vdpau.dyn')] + gallium_dri_link_depends += files('../dri-vdpau.dyn') +endif + +if with_dri + gallium_dri_link_with += libswdri +endif +if with_gallium_drisw_kms + gallium_dri_link_with += libswkmsdri +endif + +if with_gallium_radeonsi + gallium_dri_c_args += '-DGALLIUM_RADEONSI' + gallium_dri_link_with += [ + libradeonsi, libnir, libradeonwinsys, libamdgpuwinsys, libradeon, + libamd_common, + ] + gallium_dri_drivers += 'radeonsi_dri.so' +endif + +libgallium_dri = shared_library( + 'gallium_dri', + [files('target.c'), gallium_dri_sources], + include_directories : [ + inc_common, inc_util, inc_dri_common, inc_gallium_drivers, + inc_gallium_winsys, include_directories('../../state_trackers/dri'), + ], + c_args : [c_vis_args, gallium_dri_c_args], + cpp_args : [cpp_vis_args], + link_args : [ld_args_gc_sections, gallium_dri_ld_args], + link_depends : gallium_dri_link_depends, + link_with : [ + libmesa_gallium, libdricommon, libmegadriver_stub, libdri, libgalliumvl, + libgallium, libddebug, libnoop, librbug, libtrace, libglapi, + libpipe_loader_static, libws_null, libwsw, gallium_dri_link_with, + ], + dependencies : [ + gallium_dri_depends, dep_selinux, dep_expat, dep_libdrm, dep_llvm, + ], +) + +meson.add_install_script( + join_paths(meson.source_root(), 'bin/install_megadrivers.py'), + libgallium_dri.full_path(), + dri_drivers_path, + gallium_dri_drivers, +) |