diff options
| author | Eric Engestrom <[email protected]> | 2016-04-21 10:53:48 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-05-23 12:07:46 +0100 |
| commit | 7362bb3e219ec819835799c400cf4215a1b387d0 (patch) | |
| tree | b1943a451e24ce94623fd4e11f66a90ba6db2db7 | |
| parent | 8aeb6d768b4285f600d09f38d0b406adf46c251d (diff) | |
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 <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Chad Versace <[email protected]>
| -rw-r--r-- | include/vulkan/vulkan_intel.h | 2 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_private.h | 1 |
2 files changed, 1 insertions, 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 <vulkan/vulkan.h> #include <vulkan/vulkan_intel.h> #include <vulkan/vk_icd.h> |