On 16 November 2017 at 01:11, Dylan Baker <dy...@pnwbakers.com> wrote: > This function is required for both the Intel "Anvil" vulkan driver and > the i965 GL driver. Error out if either of those is enabled but this > function isn't found. > > Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com> > --- > meson.build | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/meson.build b/meson.build > index 261c4753427..5ac2ebc9e5d 100644 > --- a/meson.build > +++ b/meson.build > @@ -672,8 +672,10 @@ endif > > if cc.has_function('dl_iterate_phdr') > pre_args += '-DHAVE_DL_ITERATE_PHDR' > -else > - # TODO: this is required for vulkan > +elif with_intel_vk > + error('Intel "Anvil" Vulkan driver requires the dl_iterate_phdr function') > +elif with_dri_i965 and get_option('shader-cache') > + error('Intel i965 GL driver requires dl_iterate_phdr when built with > shader caching.') > endif > One idea for the future: factor out the else case into a helper function, so that it simpler to read and can be extended easily.
As-is patch is: Reviewed-by: Emil Velikov <emil.veli...@collabora.com> Side note: can we drop the shader-cache option? Thanks Emil _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev