vk/intel: use negative VK_NO_PROTOTYPES scheme
authorEric Engestrom <eric.engestrom@imgtec.com>
Thu, 21 Apr 2016 09:53:48 +0000 (10:53 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Mon, 23 May 2016 11:07:46 +0000 (12:07 +0100)
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 <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Chad Versace <chad.versace@intel.com>
include/vulkan/vulkan_intel.h
src/intel/vulkan/anv_private.h

index 1f77128961c6d7be423a16e44950f841922eda48..8ede61b53dca50196ee5d29b0355d0c2475edc0c 100644 (file)
@@ -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,
index 953d95df2c13cc9633984c82c085df78dfff8a55..6ac0745b66574b256d9b1aac7e2da09a976cb237 100644 (file)
@@ -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>