vulkan: Update from version 0.204.0 to 0.205.0
Change-Id: Ic0b91f338bcddc50b4617da266347ae8b9cc29fa
(cherry picked from commit 052ac57d4c70d934d76fb5cd94278c326e623963)
diff --git a/vulkan/libvulkan/entry.cpp b/vulkan/libvulkan/entry.cpp
index 7b8db6b..67b8c38 100644
--- a/vulkan/libvulkan/entry.cpp
+++ b/vulkan/libvulkan/entry.cpp
@@ -727,8 +727,8 @@
}
__attribute__((visibility("default")))
-VKAPI_ATTR void vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface) {
- GetVtbl(instance).DestroySurfaceKHR(instance, surface);
+VKAPI_ATTR void vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks* pAllocator) {
+ GetVtbl(instance).DestroySurfaceKHR(instance, surface, pAllocator);
}
__attribute__((visibility("default")))
@@ -752,13 +752,13 @@
}
__attribute__((visibility("default")))
-VKAPI_ATTR VkResult vkCreateSwapchainKHR(VkDevice device, const VkSwapchainCreateInfoKHR* pCreateInfo, VkSwapchainKHR* pSwapchain) {
- return GetVtbl(device).CreateSwapchainKHR(device, pCreateInfo, pSwapchain);
+VKAPI_ATTR VkResult vkCreateSwapchainKHR(VkDevice device, const VkSwapchainCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchain) {
+ return GetVtbl(device).CreateSwapchainKHR(device, pCreateInfo, pAllocator, pSwapchain);
}
__attribute__((visibility("default")))
-VKAPI_ATTR void vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain) {
- GetVtbl(device).DestroySwapchainKHR(device, swapchain);
+VKAPI_ATTR void vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain, const VkAllocationCallbacks* pAllocator) {
+ GetVtbl(device).DestroySwapchainKHR(device, swapchain, pAllocator);
}
__attribute__((visibility("default")))
@@ -777,6 +777,6 @@
}
__attribute__((visibility("default")))
-VKAPI_ATTR VkResult vkCreateAndroidSurfaceKHR(VkInstance instance, struct ANativeWindow* window, VkSurfaceKHR* pSurface) {
- return GetVtbl(instance).CreateAndroidSurfaceKHR(instance, window, pSurface);
+VKAPI_ATTR VkResult vkCreateAndroidSurfaceKHR(VkInstance instance, struct ANativeWindow* window, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) {
+ return GetVtbl(instance).CreateAndroidSurfaceKHR(instance, window, pAllocator, pSurface);
}
diff --git a/vulkan/libvulkan/loader.h b/vulkan/libvulkan/loader.h
index 6aa8673..35d0eaa 100644
--- a/vulkan/libvulkan/loader.h
+++ b/vulkan/libvulkan/loader.h
@@ -212,7 +212,7 @@
VkResult EnumerateInstanceLayerProperties(uint32_t* count,
VkLayerProperties* properties);
VkResult CreateInstance(const VkInstanceCreateInfo* create_info,
- const VkAllocationCallbacks* pAllocator,
+ const VkAllocationCallbacks* allocator,
VkInstance* instance);
PFN_vkVoidFunction GetInstanceProcAddr(VkInstance instance, const char* name);
PFN_vkVoidFunction GetDeviceProcAddr(VkDevice drv_device, const char* name);
@@ -224,7 +224,7 @@
const VkCommandBufferAllocateInfo* alloc_info,
VkCommandBuffer* cmdbufs);
VkResult DestroyDevice(VkDevice drv_device,
- const VkAllocationCallbacks* pAllocator);
+ const VkAllocationCallbacks* allocator);
void* AllocMem(VkInstance instance,
size_t size,
@@ -261,10 +261,14 @@
// -----------------------------------------------------------------------------
// swapchain.cpp
-VKAPI_ATTR VkResult CreateAndroidSurfaceKHR(VkInstance instance,
- ANativeWindow* window,
- VkSurfaceKHR* surface);
-VKAPI_ATTR void DestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface);
+VKAPI_ATTR VkResult
+CreateAndroidSurfaceKHR(VkInstance instance,
+ ANativeWindow* window,
+ const VkAllocationCallbacks* allocator,
+ VkSurfaceKHR* surface);
+VKAPI_ATTR void DestroySurfaceKHR(VkInstance instance,
+ VkSurfaceKHR surface,
+ const VkAllocationCallbacks* allocator);
VKAPI_ATTR VkResult GetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice pdev,
uint32_t queue_family,
VkSurfaceKHR surface,
@@ -286,9 +290,11 @@
VKAPI_ATTR VkResult
CreateSwapchainKHR(VkDevice device,
const VkSwapchainCreateInfoKHR* create_info,
+ const VkAllocationCallbacks* allocator,
VkSwapchainKHR* swapchain_handle);
-VKAPI_ATTR VkResult
-DestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain_handle);
+VKAPI_ATTR VkResult DestroySwapchainKHR(VkDevice device,
+ VkSwapchainKHR swapchain_handle,
+ const VkAllocationCallbacks* allocator);
VKAPI_ATTR VkResult GetSwapchainImagesKHR(VkDevice device,
VkSwapchainKHR swapchain_handle,
uint32_t* count,
diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index fa5ea59..ee15878 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -144,6 +144,7 @@
VKAPI_ATTR
VkResult CreateAndroidSurfaceKHR(VkInstance instance,
ANativeWindow* window,
+ const VkAllocationCallbacks* /*allocator*/,
VkSurfaceKHR* out_surface) {
void* mem = AllocMem(instance, sizeof(Surface), alignof(Surface),
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
@@ -171,7 +172,9 @@
}
VKAPI_ATTR
-void DestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface_handle) {
+void DestroySurfaceKHR(VkInstance instance,
+ VkSurfaceKHR surface_handle,
+ const VkAllocationCallbacks* /*allocator*/) {
Surface* surface = SurfaceFromHandle(surface_handle);
if (!surface)
return;
@@ -184,8 +187,8 @@
VkResult GetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice /*pdev*/,
uint32_t /*queue_family*/,
VkSurfaceKHR /*surface*/,
- VkBool32* pSupported) {
- *pSupported = VK_TRUE;
+ VkBool32* supported) {
+ *supported = VK_TRUE;
return VK_SUCCESS;
}
@@ -296,6 +299,7 @@
VKAPI_ATTR
VkResult CreateSwapchainKHR(VkDevice device,
const VkSwapchainCreateInfoKHR* create_info,
+ const VkAllocationCallbacks* /*allocator*/,
VkSwapchainKHR* swapchain_handle) {
int err;
VkResult result = VK_SUCCESS;
@@ -483,7 +487,9 @@
}
VKAPI_ATTR
-VkResult DestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain_handle) {
+VkResult DestroySwapchainKHR(VkDevice device,
+ VkSwapchainKHR swapchain_handle,
+ const VkAllocationCallbacks* /*allocator*/) {
const DeviceVtbl& driver_vtbl = GetDriverVtbl(device);
Swapchain* swapchain = SwapchainFromHandle(swapchain_handle);
const std::shared_ptr<ANativeWindow>& window = swapchain->surface.window;