[Intel-gfx] [Mesa-dev] [PATCH v2 mesa] vk/intel: use negative VK_NO_PROTOTYPES scheme

[Emil Velikov]

On 28 April 2016 at 19:13, Eric Engestrom <eric.engestrom at imgtec.com> wrote:
> On Mon, Apr 25, 2016 at 05:08:18PM +0100, Emil Velikov wrote:
>> On 21 April 2016 at 11:24, Eric Engestrom <eric.engestrom at imgtec.com> wrote:
>> > Commit 3d0fac7aca237bbe8ed8e2a362d3b42d0ef8c46c changed all the
>> > VK_PROTOTYPES to VK_NO_PROTOTYPES
>> > This brings the Intel header in line with the rest of the Vulkan code.
>> >
>> > Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
>> Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
>>
>> > ---
>> >
>> > This might break code that was using the old guard scheme (not sure how
>> > that could've worked anyway).
>> > What the policy on this?
>> >
>> > v2: rebase on top of 3caf2e89aa1711e80db80d2056e0a44663d9c7d2
>> >     ("anv: fix build without Wayland platform"). Should've done that the
>> >     first time around, sorry :]
>> >
>> >  include/vulkan/vulkan_intel.h  | 2 +-
>> >  src/intel/vulkan/anv_private.h | 1 -
>> >  2 files changed, 1 insertion(+), 2 deletions(-)
>> >
>> > diff --git a/include/vulkan/vulkan_intel.h b/include/vulkan/vulkan_intel.h
>> > index 1f77128..8ede61b 100644
>> > --- a/include/vulkan/vulkan_intel.h
>> > +++ b/include/vulkan/vulkan_intel.h
>> > @@ -44,7 +44,7 @@ typedef struct VkDmaBufImageCreateInfo_
>> >
>> >  typedef VkResult (VKAPI_PTR *PFN_vkCreateDmaBufImageINTEL)(VkDevice device, const VkDmaBufImageCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDeviceMemory* pMem, VkImage* pImage);
>> >
>> > -#ifdef VK_PROTOTYPES
>> > +#ifndef VK_NO_PROTOTYPES
>> >
>> Would be great to hear from the Intel guys, if there is a another
>> Cannonical repo where this change should land first ?
>
> CC'ing intel-gfx even though this isn't X-related, because I don't know
> of any other way to contact you guys :]
>
Adding the anv authors.

Jason, Chad, is there a canonical place where changes to
vulkan_intel.h should land first ? Eric has a nice fix which we want
in mesa.

Thanks
Emil