Quoting Eric Engestrom (2017-12-11 08:17:50)
> On Friday, 2017-12-08 16:27:22 -0800, Dylan Baker wrote:
> > This has only been compile tested.
> >
> > cc: Curro Jerez <curroje...@riseup.net>
> > Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
> > ---
> > include/meson.build | 19 ++++
> > meson.build | 27 +++++-
> > meson_options.txt | 12 +++
> > src/gallium/meson.build | 12 ++-
> > src/gallium/state_trackers/clover/meson.build | 122
> > ++++++++++++++++++++++++++
> > src/gallium/targets/opencl/meson.build | 73 +++++++++++++++
> > src/gallium/targets/pipe-loader/meson.build | 76 ++++++++++++++++
> > 7 files changed, 336 insertions(+), 5 deletions(-)
> > create mode 100644 src/gallium/state_trackers/clover/meson.build
> > create mode 100644 src/gallium/targets/opencl/meson.build
> > create mode 100644 src/gallium/targets/pipe-loader/meson.build
> >
> > diff --git a/include/meson.build b/include/meson.build
> > index e4dae91cede..a2e7ce6580e 100644
> > --- a/include/meson.build
> > +++ b/include/meson.build
> > @@ -78,3 +78,22 @@ if with_gallium_st_nine
> > subdir : 'd3dadapter',
> > )
> > endif
> > +
> > +# Only install the headers if we are building a stand alone implementation
> > and
> > +# not an ICD enabled implementation
> > +if with_gallium_opencl and not with_opencl_icd
> > + install_headers(
> > + 'CL/cl.h',
> > + 'CL/cl.hpp',
> > + 'CL/cl_d3d10.h',
> > + 'CL/cl_d3d11.h',
> > + 'CL/cl_dx9_media_sharing.h',
> > + 'CL/cl_egl.h',
> > + 'CL/cl_ext.h',
> > + 'CL/cl_gl.h',
> > + 'CL/cl_gl_ext.h',
> > + 'CL/cl_platform.h',
> > + 'CL/opencl.h',
> > + subdir: 'CL'
> > + )
> > +endif
> > diff --git a/meson.build b/meson.build
> > index 842d441199e..7892d2d0ec4 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -583,6 +583,20 @@ if with_gallium_st_nine
> > endif
> > endif
> >
> > +if get_option('gallium-opencl')
> > + if not with_gallium
> > + error('OpenCL Clover implementation requires at least one gallium
> > driver.')
> > + endif
> > +
> > + # TODO: alitvec?
> > + dep_clc = dependency('libclc')
> > + with_gallium_opencl = true
> > +else
> > + dep_clc = []
> > + with_gallium_opencl = false
> > +endif
> > +with_opencl_icd = get_option('gallium-opencl-icd')
>
> I would kinda prefer `combo(icd, standalone, false), default: icd`
>
> Don't have time to look in depth at this patch and 1/4 right now,
> but they both are:
> Acked-by: Eric Engestrom <eric.engest...@imgtec.com>
> I don't have a strong opinion either way, so I'll change it to a single option. The default I think should match autotools and be disabled. I'd also like to at least have someone from SWR and clover look at it before I push so I don't think this is going to land immediately.
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
