From 7362bb3e219ec819835799c400cf4215a1b387d0 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 21 Apr 2016 10:53:48 +0100 Subject: vk/intel: use negative VK_NO_PROTOTYPES scheme 3d0fac7aca237bbe8ed8e2a362d3b42d0ef8c46c changed all 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 Reviewed-by: Emil Velikov Reviewed-by: Chad Versace --- 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 1f77128961c..8ede61b53dc 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 953d95df2c1..6ac0745b665 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -54,7 +54,6 @@ typedef uint32_t xcb_window_t; struct anv_l3_config; -#define VK_PROTOTYPES #include #include #include -- cgit v1.2.3