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

[Bas Nieuwenhuizen]

On Wed, Apr 25, 2018 at 6:38 AM, Jordan Justen
<jordan.l.justen at intel.com> 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 <jordan.l.justen at intel.com>
>> wrote:
>>
>> > Fixes: 5608d0a2cee "meson: use array type options"
>> > Cc: Dylan Baker <dylan at pnwbakers.com>
>> > Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
>> > ---
>> >  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 at lists.freedesktop.org
>> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>> >
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev