diff options
author | Bas Nieuwenhuizen <[email protected]> | 2019-03-17 18:21:28 +0100 |
---|---|---|
committer | Bas Nieuwenhuizen <[email protected]> | 2019-03-18 14:48:41 +0000 |
commit | 42ea88c673c74e5837b00a179fbcb9edeac88e4c (patch) | |
tree | f0d8958221e0af3827a49b455e32ba2b1722228b /include/vulkan/vulkan_android.h | |
parent | eb5cda1c3eca15790c46fcb7fd62408a7e0ba5f8 (diff) |
vulkan: Update the XML and headers to 1.1.104
Acked-by: Samuel Pitoiset <[email protected]>
Acked-by: Eric Engestrom <[email protected]>
Acked-by: Lionel Landwerlin <[email protected]>
Diffstat (limited to 'include/vulkan/vulkan_android.h')
-rw-r--r-- | include/vulkan/vulkan_android.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/vulkan/vulkan_android.h b/include/vulkan/vulkan_android.h index e70376c8867..1861802411e 100644 --- a/include/vulkan/vulkan_android.h +++ b/include/vulkan/vulkan_android.h @@ -27,14 +27,12 @@ extern "C" { */ + #define VK_KHR_android_surface 1 struct ANativeWindow; - #define VK_KHR_ANDROID_SURFACE_SPEC_VERSION 6 #define VK_KHR_ANDROID_SURFACE_EXTENSION_NAME "VK_KHR_android_surface" - typedef VkFlags VkAndroidSurfaceCreateFlagsKHR; - typedef struct VkAndroidSurfaceCreateInfoKHR { VkStructureType sType; const void* pNext; @@ -42,7 +40,6 @@ typedef struct VkAndroidSurfaceCreateInfoKHR { struct ANativeWindow* window; } VkAndroidSurfaceCreateInfoKHR; - typedef VkResult (VKAPI_PTR *PFN_vkCreateAndroidSurfaceKHR)(VkInstance instance, const VkAndroidSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface); #ifndef VK_NO_PROTOTYPES @@ -53,12 +50,11 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateAndroidSurfaceKHR( VkSurfaceKHR* pSurface); #endif + #define VK_ANDROID_external_memory_android_hardware_buffer 1 struct AHardwareBuffer; - #define VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_SPEC_VERSION 3 #define VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME "VK_ANDROID_external_memory_android_hardware_buffer" - typedef struct VkAndroidHardwareBufferUsageANDROID { VkStructureType sType; void* pNext; @@ -103,7 +99,6 @@ typedef struct VkExternalFormatANDROID { uint64_t externalFormat; } VkExternalFormatANDROID; - typedef VkResult (VKAPI_PTR *PFN_vkGetAndroidHardwareBufferPropertiesANDROID)(VkDevice device, const struct AHardwareBuffer* buffer, VkAndroidHardwareBufferPropertiesANDROID* pProperties); typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryAndroidHardwareBufferANDROID)(VkDevice device, const VkMemoryGetAndroidHardwareBufferInfoANDROID* pInfo, struct AHardwareBuffer** pBuffer); |