Re: [Mesa-dev] [PATCH] meson: Fix with_intel_vk and with_amd_vk variables

2018-04-25 Thread Dylan Baker
Quoting Mike Lothian (2018-04-24 18:49:10)
> Can you also add radeon to the amd one? That works on autotools
> 
> On Wed, 25 Apr 2018 at 02:16 Jordan Justen  wrote:
> 
> Fixes: 5608d0a2cee "meson: use array type options"
> Cc: Dylan Baker 
> Signed-off-by: Jordan Justen 
> ---
>  meson.build | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 52a1075823f..c0e5c94d794 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -213,8 +213,8 @@ if _vulkan_drivers.contains('auto')
>    endif
>  endif
>  if _vulkan_drivers != ['']
> -  with_intel_vk = _drivers.contains('intel')
> -  with_amd_vk = _drivers.contains('amd')
> +  with_intel_vk = _vulkan_drivers.contains('intel')
> +  with_amd_vk = _vulkan_drivers.contains('amd')
>    with_any_vk = true
>  endif
> 
> --
> 2.16.2
> 
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
> 

At this point I think the ship has kinda sailed on changing the names of various
flags unless we're significantly reworking the functionality, we have a lot of
devs and some distros using meson already. Adding a compatibility option to
match autotools seems short sighted, the plan to remove autotools and scons
remains (once we have functional equivalence). I also like the symmetry of intel
and amd being the choices, but that's just personal taste.

Just my 2¢.

Dylan


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] meson: Fix with_intel_vk and with_amd_vk variables

2018-04-24 Thread Jordan Justen
On 2018-04-24 22:31:23, Bas Nieuwenhuizen wrote:
> On Wed, Apr 25, 2018 at 6:38 AM, Jordan Justen
>  wrote:
> > On 2018-04-24 18:49:10, Mike Lothian wrote:
> >> Can you also add radeon to the amd one? That works on autotools
> >
> > There is already a with_gallium_radeonsi flag. Is that what you mean?
> 
> I'm guessing that he means that we currently use -Dvulkan-drivers=amd
> with meson while we use --with-vulkan-drivers=radeon on autotools.

Ah. Yeah, that does seem like a reasonable request.

> I think if we're going to change that that it should be in its own
> commit though, and not related to this fix.

I agree. It does seem like something that might require more
discussion than a bug fix.

Thanks,

-Jordan

> >
> > This is just a patch to fix the vulkan variables after 5608d0a2cee.
> > Without this change, setting -Dvulkan-drivers=intel doesn't work.
> >
> > -Jordan
> >
> >> On Wed, 25 Apr 2018 at 02:16 Jordan Justen 
> >> wrote:
> >>
> >> > Fixes: 5608d0a2cee "meson: use array type options"
> >> > Cc: Dylan Baker 
> >> > Signed-off-by: Jordan Justen 
> >> > ---
> >> >  meson.build | 4 ++--
> >> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >> >
> >> > diff --git a/meson.build b/meson.build
> >> > index 52a1075823f..c0e5c94d794 100644
> >> > --- a/meson.build
> >> > +++ b/meson.build
> >> > @@ -213,8 +213,8 @@ if _vulkan_drivers.contains('auto')
> >> >endif
> >> >  endif
> >> >  if _vulkan_drivers != ['']
> >> > -  with_intel_vk = _drivers.contains('intel')
> >> > -  with_amd_vk = _drivers.contains('amd')
> >> > +  with_intel_vk = _vulkan_drivers.contains('intel')
> >> > +  with_amd_vk = _vulkan_drivers.contains('amd')
> >> >with_any_vk = true
> >> >  endif
> >> >
> >> > --
> >> > 2.16.2
> >> >
> >> > ___
> >> > mesa-dev mailing list
> >> > mesa-dev@lists.freedesktop.org
> >> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
> >> >
> > ___
> > mesa-dev mailing list
> > mesa-dev@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] meson: Fix with_intel_vk and with_amd_vk variables

2018-04-24 Thread Bas Nieuwenhuizen
On Wed, Apr 25, 2018 at 6:38 AM, Jordan Justen
 wrote:
> On 2018-04-24 18:49:10, Mike Lothian wrote:
>> Can you also add radeon to the amd one? That works on autotools
>
> There is already a with_gallium_radeonsi flag. Is that what you mean?

I'm guessing that he means that we currently use -Dvulkan-drivers=amd
with meson while we use --with-vulkan-drivers=radeon on autotools.

I think if we're going to change that that it should be in its own
commit though, and not related to this fix.

>
> This is just a patch to fix the vulkan variables after 5608d0a2cee.
> Without this change, setting -Dvulkan-drivers=intel doesn't work.
>
> -Jordan
>
>> On Wed, 25 Apr 2018 at 02:16 Jordan Justen 
>> wrote:
>>
>> > Fixes: 5608d0a2cee "meson: use array type options"
>> > Cc: Dylan Baker 
>> > Signed-off-by: Jordan Justen 
>> > ---
>> >  meson.build | 4 ++--
>> >  1 file changed, 2 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/meson.build b/meson.build
>> > index 52a1075823f..c0e5c94d794 100644
>> > --- a/meson.build
>> > +++ b/meson.build
>> > @@ -213,8 +213,8 @@ if _vulkan_drivers.contains('auto')
>> >endif
>> >  endif
>> >  if _vulkan_drivers != ['']
>> > -  with_intel_vk = _drivers.contains('intel')
>> > -  with_amd_vk = _drivers.contains('amd')
>> > +  with_intel_vk = _vulkan_drivers.contains('intel')
>> > +  with_amd_vk = _vulkan_drivers.contains('amd')
>> >with_any_vk = true
>> >  endif
>> >
>> > --
>> > 2.16.2
>> >
>> > ___
>> > mesa-dev mailing list
>> > mesa-dev@lists.freedesktop.org
>> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>> >
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] meson: Fix with_intel_vk and with_amd_vk variables

2018-04-24 Thread Tapani Pälli

Reviewed-by: Tapani Pälli 

On 25.04.2018 04:16, Jordan Justen wrote:

Fixes: 5608d0a2cee "meson: use array type options"
Cc: Dylan Baker 
Signed-off-by: Jordan Justen 
---
  meson.build | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 52a1075823f..c0e5c94d794 100644
--- a/meson.build
+++ b/meson.build
@@ -213,8 +213,8 @@ if _vulkan_drivers.contains('auto')
endif
  endif
  if _vulkan_drivers != ['']
-  with_intel_vk = _drivers.contains('intel')
-  with_amd_vk = _drivers.contains('amd')
+  with_intel_vk = _vulkan_drivers.contains('intel')
+  with_amd_vk = _vulkan_drivers.contains('amd')
with_any_vk = true
  endif
  


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


Re: [Mesa-dev] [PATCH] meson: Fix with_intel_vk and with_amd_vk variables

2018-04-24 Thread Jordan Justen
On 2018-04-24 18:49:10, Mike Lothian wrote:
> Can you also add radeon to the amd one? That works on autotools

There is already a with_gallium_radeonsi flag. Is that what you mean?

This is just a patch to fix the vulkan variables after 5608d0a2cee.
Without this change, setting -Dvulkan-drivers=intel doesn't work.

-Jordan

> On Wed, 25 Apr 2018 at 02:16 Jordan Justen 
> wrote:
> 
> > Fixes: 5608d0a2cee "meson: use array type options"
> > Cc: Dylan Baker 
> > Signed-off-by: Jordan Justen 
> > ---
> >  meson.build | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/meson.build b/meson.build
> > index 52a1075823f..c0e5c94d794 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -213,8 +213,8 @@ if _vulkan_drivers.contains('auto')
> >endif
> >  endif
> >  if _vulkan_drivers != ['']
> > -  with_intel_vk = _drivers.contains('intel')
> > -  with_amd_vk = _drivers.contains('amd')
> > +  with_intel_vk = _vulkan_drivers.contains('intel')
> > +  with_amd_vk = _vulkan_drivers.contains('amd')
> >with_any_vk = true
> >  endif
> >
> > --
> > 2.16.2
> >
> > ___
> > mesa-dev mailing list
> > mesa-dev@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
> >
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] meson: Fix with_intel_vk and with_amd_vk variables

2018-04-24 Thread Mike Lothian
Can you also add radeon to the amd one? That works on autotools

On Wed, 25 Apr 2018 at 02:16 Jordan Justen 
wrote:

> Fixes: 5608d0a2cee "meson: use array type options"
> Cc: Dylan Baker 
> Signed-off-by: Jordan Justen 
> ---
>  meson.build | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 52a1075823f..c0e5c94d794 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -213,8 +213,8 @@ if _vulkan_drivers.contains('auto')
>endif
>  endif
>  if _vulkan_drivers != ['']
> -  with_intel_vk = _drivers.contains('intel')
> -  with_amd_vk = _drivers.contains('amd')
> +  with_intel_vk = _vulkan_drivers.contains('intel')
> +  with_amd_vk = _vulkan_drivers.contains('amd')
>with_any_vk = true
>  endif
>
> --
> 2.16.2
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH] meson: Fix with_intel_vk and with_amd_vk variables

2018-04-24 Thread Jordan Justen
Fixes: 5608d0a2cee "meson: use array type options"
Cc: Dylan Baker 
Signed-off-by: Jordan Justen 
---
 meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 52a1075823f..c0e5c94d794 100644
--- a/meson.build
+++ b/meson.build
@@ -213,8 +213,8 @@ if _vulkan_drivers.contains('auto')
   endif
 endif
 if _vulkan_drivers != ['']
-  with_intel_vk = _drivers.contains('intel')
-  with_amd_vk = _drivers.contains('amd')
+  with_intel_vk = _vulkan_drivers.contains('intel')
+  with_amd_vk = _vulkan_drivers.contains('amd')
   with_any_vk = true
 endif
 
-- 
2.16.2

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