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.engest...@imgtec.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 VKAPI_ATTR VkResult VKAPI_CALL vkCreateDmaBufImageINTEL( VkDevice _device, diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index d8a2194..ebdb880 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -52,7 +52,6 @@ typedef struct xcb_connection_t xcb_connection_t; typedef uint32_t xcb_visualid_t; typedef uint32_t xcb_window_t; -#define VK_PROTOTYPES #include <vulkan/vulkan.h> #include <vulkan/vulkan_intel.h> #include <vulkan/vk_icd.h> -- 2.8.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev