[Mesa-dev] [PATCH 3/4] meson: Fix TODO for missing dl_iterate_phdr function

2017-11-15 Thread Dylan Baker 
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 
---
 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
 
 # Determine whether or not the rt library is needed for time functions
-- 
2.15.0

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 3/4] meson: Fix TODO for missing dl_iterate_phdr function

2017-11-16 Thread Emil Velikov 
On 16 November 2017 at 01:11, Dylan Baker  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 
> ---
>  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 

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

Re: [Mesa-dev] [PATCH 3/4] meson: Fix TODO for missing dl_iterate_phdr function

2017-11-16 Thread Dylan Baker 
Quoting Emil Velikov (2017-11-16 05:21:50)
> On 16 November 2017 at 01:11, Dylan Baker  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 
> > ---
> >  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 
> 
> Side note: can we drop the shader-cache option?

Yes, I'm all for dropping options!

> 
> Thanks
> Emil


signature.asc
Description: signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 3/4] meson: Fix TODO for missing dl_iterate_phdr function

2017-11-16 Thread Dylan Baker 
Quoting Emil Velikov (2017-11-16 05:21:50)
> On 16 November 2017 at 01:11, Dylan Baker  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 
> > ---
> >  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.

meson doesn't have user definable functions. On the other hand, if we dropped
the shader-cache option altoghether we could just combine this into:
 error('The Intel "Anvil" and "i965" drivers require the dl_iterate_phdr 
function')

> 
> As-is patch is:
> Reviewed-by: Emil Velikov 
> 
> Side note: can we drop the shader-cache option?
> 
> Thanks
> Emil


signature.asc
Description: signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev