[Mesa-dev] [PATCH 14/14] meson: build gallium nine state_tracker

[Dylan Baker]

Quoting Marc Dietrich (2017-11-29 04:41:15)
> Am Mittwoch, 29. November 2017, 00:30:35 CET schrieb Dylan Baker:
> > Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> > ---
> >  include/meson.build                                |  8 ++
> >  meson.build                                        | 17 +++-
> >  meson_options.txt                                  | 12 +++
> >  src/gallium/meson.build                            |  7 +-
> >  .../gallium/state_trackers/nine}/meson.build       | 95
> > +++++++++++----------- src/gallium/targets/d3dadapter9/meson.build        |
> > 72 ++++++++++++++++ 6 files changed, 162 insertions(+), 49 deletions(-)
> >  copy {include => src/gallium/state_trackers/nine}/meson.build (50%)
> >  create mode 100644 src/gallium/targets/d3dadapter9/meson.build
> > 
> > diff --git a/include/meson.build b/include/meson.build
> > index b5f533bd185..54e454d82a4 100644
> > --- a/include/meson.build
> > +++ b/include/meson.build
> > @@ -20,6 +20,7 @@
> > 
> >  inc_drm_uapi = include_directories('drm-uapi')
> >  inc_vulkan = include_directories('vulkan')
> > +inc_d3d9 = include_directories('D3D9')
> > 
> >  if with_gles1
> >    install_headers(
> > @@ -66,3 +67,10 @@ if with_egl
> >      subdir : 'EGL',
> >    )
> >  endif
> > +
> > +if with_gallium_st_nine
> > +  install_headers(
> > +    'd3dadapter/d3dadapter9.h', 'd3dadapter/drm.h', 'd3dadapter/present.h',
> > +    subdir : 'd3dadapter',
> > +  )
> > +endif
> > diff --git a/meson.build b/meson.build
> > index 7801736c91a..bba9a292aab 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -1100,7 +1100,22 @@ if with_platform_x11
> >    endif
> >  endif
> > 
> > -# TODO: nine
> > +dri_drivers_path = get_option('d3d-drivers-path')
> > +if dri_drivers_path == ''
> > +  dri_drivers_path = join_paths(get_option('libdir'), 'd3d')
> > +endif
> 
> I guess this overwrites the dri install path.
> 
> Marc

Gahh, copy and paste error. Fixed locally.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20171129/e09abc5f/attachment.sig>