[Mesa-dev] [PATCH 15/20] meson: build radeonsi gallium driver

[Eric Anholt]

Dylan Baker <dylan at pnwbakers.com> writes:

> This hooks up the bits necessary to build gallium dri drivers, with
> radeonSI as the first example driver. This isn't tested yet.
> ---
>  src/gallium/meson.build             |  3 +-
>  src/gallium/targets/dri/meson.build | 90 +++++++++++++++++++++++++++++++++++++
>  2 files changed, 91 insertions(+), 2 deletions(-)
>  create mode 100644 src/gallium/targets/dri/meson.build
>
> 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..382b00db5dc
> --- /dev/null
> +++ b/src/gallium/targets/dri/meson.build
> @@ -0,0 +1,90 @@
> +# 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_sources += si_driinfo_h

This seems out of place -- nothing here includes that file, right?

Other than that, my eyes are glazing over, but I think patches 10-17
are:

Reviewed-by: Eric Anholt <eric at anholt.net>


> +  gallium_dri_link_with += [
> +    libradeonsi, libnir, libradeonwinsys, libamdgpuwinsys, libradeon,
> +    libamd_common,
> +  ]
> +  gallium_dri_drivers += 'radeonsi_dri.so'
> +endif
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 832 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20171012/7c885d54/attachment.sig>