vulkan: Update from version 0.204.0 to 0.205.0
Change-Id: Ic0b91f338bcddc50b4617da266347ae8b9cc29fa
(cherry picked from commit 052ac57d4c70d934d76fb5cd94278c326e623963)
diff --git a/vulkan/api/vulkan.api b/vulkan/api/vulkan.api
index c77a148..1c4bb8f 100644
--- a/vulkan/api/vulkan.api
+++ b/vulkan/api/vulkan.api
@@ -27,7 +27,7 @@
// API version (major.minor.patch)
define VERSION_MAJOR 0
-define VERSION_MINOR 204
+define VERSION_MINOR 205
define VERSION_PATCH 0
// API limits
@@ -45,43 +45,43 @@
// API keyword, but needs special handling by some templates
define NULL_HANDLE 0
-@extension("VK_KHR_surface") define VK_KHR_SURFACE_REVISION 22
+@extension("VK_KHR_surface") define VK_KHR_SURFACE_REVISION 23
@extension("VK_KHR_surface") define VK_KHR_SURFACE_EXTENSION_NUMBER 1
@extension("VK_KHR_surface") define VK_KHR_SURFACE_EXTENSION_NAME "VK_KHR_surface"
-@extension("VK_KHR_swapchain") define VK_KHR_SWAPCHAIN_REVISION 65
+@extension("VK_KHR_swapchain") define VK_KHR_SWAPCHAIN_REVISION 66
@extension("VK_KHR_swapchain") define VK_KHR_SWAPCHAIN_EXTENSION_NUMBER 2
@extension("VK_KHR_swapchain") define VK_KHR_SWAPCHAIN_EXTENSION_NAME "VK_KHR_swapchain"
-@extension("VK_KHR_display") define VK_KHR_DISPLAY_REVISION 18
+@extension("VK_KHR_display") define VK_KHR_DISPLAY_REVISION 19
@extension("VK_KHR_display") define VK_KHR_DISPLAY_EXTENSION_NUMBER 3
@extension("VK_KHR_display") define VK_KHR_DISPLAY_EXTENSION_NAME "VK_KHR_display"
-@extension("VK_KHR_display_swapchain") define VK_KHR_DISPLAY_REVISION 7
-@extension("VK_KHR_display_swapchain") define VK_KHR_DISPLAY_EXTENSION_NUMBER 4
-@extension("VK_KHR_display_swapchain") define VK_KHR_DISPLAY_EXTENSION_NAME "VK_KHR_display_swapchain"
+@extension("VK_KHR_display_swapchain") define VK_KHR_DISPLAY_SWAPCHAIN_REVISION 8
+@extension("VK_KHR_display_swapchain") define VK_KHR_DISPLAY_SWAPCHAIN_EXTENSION_NUMBER 4
+@extension("VK_KHR_display_swapchain") define VK_KHR_DISPLAY_SWAPCHAIN_EXTENSION_NAME "VK_KHR_display_swapchain"
-@extension("VK_KHR_xlib_surface") define VK_KHR_XLIB_SURFACE_REVISION 4
+@extension("VK_KHR_xlib_surface") define VK_KHR_XLIB_SURFACE_REVISION 5
@extension("VK_KHR_xlib_surface") define VK_KHR_XLIB_SURFACE_NUMBER 5
@extension("VK_KHR_xlib_surface") define VK_KHR_XLIB_SURFACE_NAME "VK_KHR_xlib_surface"
-@extension("VK_KHR_xcb_surface") define VK_KHR_XCB_SURFACE_REVISION 4
+@extension("VK_KHR_xcb_surface") define VK_KHR_XCB_SURFACE_REVISION 5
@extension("VK_KHR_xcb_surface") define VK_KHR_XCB_SURFACE_NUMBER 6
@extension("VK_KHR_xcb_surface") define VK_KHR_XCB_SURFACE_NAME "VK_KHR_xcb_surface"
-@extension("VK_KHR_wayland_surface") define VK_KHR_WAYLAND_SURFACE_REVISION 3
+@extension("VK_KHR_wayland_surface") define VK_KHR_WAYLAND_SURFACE_REVISION 4
@extension("VK_KHR_wayland_surface") define VK_KHR_WAYLAND_SURFACE_NUMBER 7
@extension("VK_KHR_wayland_surface") define VK_KHR_WAYLAND_SURFACE_NAME "VK_KHR_wayland_surface"
-@extension("VK_KHR_mir_surface") define VK_KHR_MIR_SURFACE_REVISION 3
+@extension("VK_KHR_mir_surface") define VK_KHR_MIR_SURFACE_REVISION 4
@extension("VK_KHR_mir_surface") define VK_KHR_MIR_SURFACE_NUMBER 8
@extension("VK_KHR_mir_surface") define VK_KHR_MIR_SURFACE_NAME "VK_KHR_mir_surface"
-@extension("VK_KHR_android_surface") define VK_KHR_ANDROID_SURFACE_REVISION 2
+@extension("VK_KHR_android_surface") define VK_KHR_ANDROID_SURFACE_REVISION 3
@extension("VK_KHR_android_surface") define VK_KHR_ANDROID_SURFACE_NUMBER 8
@extension("VK_KHR_android_surface") define VK_KHR_ANDROID_SURFACE_NAME "VK_KHR_android_surface"
-@extension("VK_KHR_win32_surface") define VK_KHR_WIN32_SURFACE_REVISION 3
+@extension("VK_KHR_win32_surface") define VK_KHR_WIN32_SURFACE_REVISION 4
@extension("VK_KHR_win32_surface") define VK_KHR_WIN32_SURFACE_NUMBER 9
@extension("VK_KHR_win32_surface") define VK_KHR_WIN32_SURFACE_NAME "VK_KHR_win32_surface"
@@ -4594,7 +4594,8 @@
@extension("VK_KHR_surface")
cmd void vkDestroySurfaceKHR(
VkInstance instance,
- VkSurfaceKHR surface) {
+ VkSurfaceKHR surface,
+ const VkAllocationCallbacks* pAllocator) {
instanceObject := GetInstance(instance)
surfaceObject := GetSurface(surface)
assert(surfaceObject.instance == instance)
@@ -4670,6 +4671,7 @@
cmd VkResult vkCreateSwapchainKHR(
VkDevice device,
const VkSwapchainCreateInfoKHR* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
VkSwapchainKHR* pSwapchain) {
assert(pCreateInfo.sType == VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR)
deviceObject := GetDevice(device)
@@ -4684,7 +4686,8 @@
@extension("VK_KHR_swapchain")
cmd void vkDestroySwapchainKHR(
VkDevice device,
- VkSwapchainKHR swapchain) {
+ VkSwapchainKHR swapchain,
+ const VkAllocationCallbacks* pAllocator) {
deviceObject := GetDevice(device)
swapchainObject := GetSwapchain(swapchain)
assert(swapchainObject.device == device)
@@ -4784,6 +4787,7 @@
VkPhysicalDevice physicalDevice,
VkDisplayKHR display,
const VkDisplayModeCreateInfoKHR* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
VkDisplayModeKHR* pMode) {
physicalDeviceObject := GetPhysicalDevice(physicalDevice)
return ?
@@ -4803,6 +4807,7 @@
cmd VkResult vkCreateDisplayPlaneSurfaceKHR(
VkInstance instance,
const VkDisplaySurfaceCreateInfoKHR* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
VkSurfaceKHR* pSurface) {
return ?
}
@@ -4812,6 +4817,7 @@
VkInstance instance,
platform.Display* dpy,
platform.Window window,
+ const VkAllocationCallbacks* pAllocator,
VkSurfaceKHR* pSurface) {
instanceObject := GetInstance(instance)
return ?
@@ -4832,6 +4838,7 @@
VkInstance instance,
platform.xcb_connection_t* connection,
platform.xcb_window_t window,
+ const VkAllocationCallbacks* pAllocator,
VkSurfaceKHR* pSurface) {
instanceObject := GetInstance(instance)
return ?
@@ -4852,6 +4859,7 @@
VkInstance instance,
platform.wl_display* display,
platform.wl_surface* surface,
+ const VkAllocationCallbacks* pAllocator,
VkSurfaceKHR* pSurface) {
instanceObject := GetInstance(instance)
return ?
@@ -4871,6 +4879,7 @@
VkInstance instance,
platform.MirConnection* connection,
platform.MirSurface* mirSurface,
+ const VkAllocationCallbacks* pAllocator,
VkSurfaceKHR* pSurface) {
instanceObject := GetInstance(instance)
return ?
@@ -4888,7 +4897,8 @@
@extension("VK_KHR_android_surface")
cmd VkResult vkCreateAndroidSurfaceKHR(
VkInstance instance,
- platform.ANativeWindow* window
+ platform.ANativeWindow* window,
+ const VkAllocationCallbacks* pAllocator,
VkSurfaceKHR* pSurface) {
instanceObject := GetInstance(instance)
return ?
@@ -4899,6 +4909,7 @@
VkInstance instance,
platform.HINSTANCE hinstance,
platform.HWND hwnd,
+ const VkAllocationCallbacks* pAllocator,
VkSurfaceKHR* pSurface) {
instanceObject := GetInstance(instance)
return ?
diff --git a/vulkan/include/vulkan/vulkan.h b/vulkan/include/vulkan/vulkan.h
index 2791b8a..b342285 100644
--- a/vulkan/include/vulkan/vulkan.h
+++ b/vulkan/include/vulkan/vulkan.h
@@ -41,7 +41,7 @@
((major << 22) | (minor << 12) | patch)
// Vulkan API version supported by this file
-#define VK_API_VERSION VK_MAKE_VERSION(0, 204, 0)
+#define VK_API_VERSION VK_MAKE_VERSION(0, 205, 0)
#define VK_NULL_HANDLE 0
@@ -3068,7 +3068,7 @@
#define VK_KHR_surface 1
VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR)
-#define VK_KHR_SURFACE_REVISION 22
+#define VK_KHR_SURFACE_REVISION 23
#define VK_KHR_SURFACE_EXTENSION_NUMBER 1
#define VK_KHR_SURFACE_EXTENSION_NAME "VK_KHR_surface"
#define VK_ERROR_SURFACE_LOST_KHR ((VkResult)(int)0xc0000400)
@@ -3150,7 +3150,7 @@
} VkSurfaceFormatKHR;
-typedef void (VKAPI_PTR *PFN_vkDestroySurfaceKHR)(VkInstance instance, VkSurfaceKHR surface);
+typedef void (VKAPI_PTR *PFN_vkDestroySurfaceKHR)(VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks* pAllocator);
typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfaceSupportKHR)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, VkSurfaceKHR surface, VkBool32* pSupported);
typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR)(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR* pSurfaceCapabilities);
typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfaceFormatsKHR)(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats);
@@ -3159,7 +3159,8 @@
#ifdef VK_PROTOTYPES
VKAPI_ATTR void VKAPI_CALL vkDestroySurfaceKHR(
VkInstance instance,
- VkSurfaceKHR surface);
+ VkSurfaceKHR surface,
+ const VkAllocationCallbacks* pAllocator);
VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceSupportKHR(
VkPhysicalDevice physicalDevice,
@@ -3188,7 +3189,7 @@
#define VK_KHR_swapchain 1
VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSwapchainKHR)
-#define VK_KHR_SWAPCHAIN_REVISION 65
+#define VK_KHR_SWAPCHAIN_REVISION 66
#define VK_KHR_SWAPCHAIN_EXTENSION_NUMBER 2
#define VK_KHR_SWAPCHAIN_EXTENSION_NAME "VK_KHR_swapchain"
#define VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR ((VkStructureType)(int)0xc0000800)
@@ -3229,8 +3230,8 @@
} VkPresentInfoKHR;
-typedef VkResult (VKAPI_PTR *PFN_vkCreateSwapchainKHR)(VkDevice device, const VkSwapchainCreateInfoKHR* pCreateInfo, VkSwapchainKHR* pSwapchain);
-typedef void (VKAPI_PTR *PFN_vkDestroySwapchainKHR)(VkDevice device, VkSwapchainKHR swapchain);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateSwapchainKHR)(VkDevice device, const VkSwapchainCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchain);
+typedef void (VKAPI_PTR *PFN_vkDestroySwapchainKHR)(VkDevice device, VkSwapchainKHR swapchain, const VkAllocationCallbacks* pAllocator);
typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainImagesKHR)(VkDevice device, VkSwapchainKHR swapchain, uint32_t* pSwapchainImageCount, VkImage* pSwapchainImages);
typedef VkResult (VKAPI_PTR *PFN_vkAcquireNextImageKHR)(VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t* pImageIndex);
typedef VkResult (VKAPI_PTR *PFN_vkQueuePresentKHR)(VkQueue queue, VkPresentInfoKHR* pPresentInfo);
@@ -3239,11 +3240,13 @@
VKAPI_ATTR VkResult VKAPI_CALL vkCreateSwapchainKHR(
VkDevice device,
const VkSwapchainCreateInfoKHR* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
VkSwapchainKHR* pSwapchain);
VKAPI_ATTR void VKAPI_CALL vkDestroySwapchainKHR(
VkDevice device,
- VkSwapchainKHR swapchain);
+ VkSwapchainKHR swapchain,
+ const VkAllocationCallbacks* pAllocator);
VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainImagesKHR(
VkDevice device,
@@ -3268,7 +3271,7 @@
VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDisplayKHR)
VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDisplayModeKHR)
-#define VK_KHR_DISPLAY_REVISION 18
+#define VK_KHR_DISPLAY_REVISION 19
#define VK_KHR_DISPLAY_EXTENSION_NUMBER 3
#define VK_KHR_DISPLAY_EXTENSION_NAME "VK_KHR_display"
#define VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR ((VkStructureType)(int)0xc0000c00)
@@ -3342,9 +3345,9 @@
typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR)(VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPlanePropertiesKHR* pProperties);
typedef VkResult (VKAPI_PTR *PFN_vkGetDisplayPlaneSupportedDisplaysKHR)(VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayKHR* pProperties);
typedef VkResult (VKAPI_PTR *PFN_vkGetDisplayModePropertiesKHR)(VkPhysicalDevice physicalDevice, VkDisplayKHR display, uint32_t* pPropertyCount, VkDisplayModePropertiesKHR* pProperties);
-typedef VkResult (VKAPI_PTR *PFN_vkCreateDisplayModeKHR)(VkPhysicalDevice physicalDevice, VkDisplayKHR display, const VkDisplayModeCreateInfoKHR*pCreateInfo, VkDisplayModeKHR* pMode);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateDisplayModeKHR)(VkPhysicalDevice physicalDevice, VkDisplayKHR display, const VkDisplayModeCreateInfoKHR*pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDisplayModeKHR* pMode);
typedef VkResult (VKAPI_PTR *PFN_vkGetDisplayPlaneCapabilitiesKHR)(VkPhysicalDevice physicalDevice, VkDisplayModeCreateInfoKHR mode, uint32_t planeIndex, VkDisplayPlaneCapabilitiesKHR* pCapabilities);
-typedef VkResult (VKAPI_PTR *PFN_vkCreateDisplayPlaneSurfaceKHR)(VkInstance instance, const VkDisplaySurfaceCreateInfoKHR* pCreateInfo, VkSurfaceKHR* pSurface);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateDisplayPlaneSurfaceKHR)(VkInstance instance, const VkDisplaySurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
#ifdef VK_PROTOTYPES
VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceDisplayPropertiesKHR(
@@ -3372,6 +3375,7 @@
VkPhysicalDevice physicalDevice,
VkDisplayKHR display,
const VkDisplayModeCreateInfoKHR* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
VkDisplayModeKHR* pMode);
VKAPI_ATTR VkResult VKAPI_CALL vkGetDisplayPlaneCapabilitiesKHR(
@@ -3383,11 +3387,12 @@
VKAPI_ATTR VkResult VKAPI_CALL vkCreateDisplayPlaneSurfaceKHR(
VkInstance instance,
const VkDisplaySurfaceCreateInfoKHR* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
VkSurfaceKHR* pSurface);
#endif
#define VK_KHR_display_swapchain 1
-#define VK_KHR_DISPLAY_SWAPCHAIN_REVISION 7
+#define VK_KHR_DISPLAY_SWAPCHAIN_REVISION 8
#define VK_KHR_DISPLAY_SWAPCHAIN_EXTENSION_NUMBER 4
#define VK_KHR_DISPLAY_SWAPCHAIN_EXTENSION_NAME "VK_KHR_display_swapchain"
#define VK_STRUCTURE_TYPE_DISPLAY_SWAPCHAIN_CREATE_INFO_KHR ((VkStructureType)(int)0xc0001000)
@@ -3414,11 +3419,11 @@
#define VK_KHR_xlib_surface 1
#include <X11/Xlib.h>
-#define VK_KHR_XLIB_SURFACE_REVISION 4
+#define VK_KHR_XLIB_SURFACE_REVISION 5
#define VK_KHR_XLIB_SURFACE_EXTENSION_NUMBER 5
#define VK_KHR_XLIB_SURFACE_EXTENSION_NAME "VK_KHR_xlib_surface"
-typedef VkResult (VKAPI_PTR *PFN_vkCreateXlibSurfaceKHR)(VkInstance instance, Display* dpy, Window window, VkSurfaceKHR* pSurface);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateXlibSurfaceKHR)(VkInstance instance, Display* dpy, Window window, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, Display* dpy, VisualID visualID);
#ifdef VK_PROTOTYPES
@@ -3426,6 +3431,7 @@
VkInstance instance,
Display* dpy,
Window window,
+ const VkAllocationCallbacks* pAllocator,
VkSurfaceKHR* pSurface);
VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceXlibPresentationSupportKHR(
@@ -3440,11 +3446,11 @@
#define VK_KHR_xcb_surface 1
#include <xcb/xcb.h>
-#define VK_KHR_XCB_SURFACE_REVISION 4
+#define VK_KHR_XCB_SURFACE_REVISION 5
#define VK_KHR_XCB_SURFACE_EXTENSION_NUMBER 6
#define VK_KHR_XCB_SURFACE_EXTENSION_NAME "VK_KHR_xcb_surface"
-typedef VkResult (VKAPI_PTR *PFN_vkCreateXcbSurfaceKHR)(VkInstance instance, xcb_connection_t* connection, xcb_window_t window, VkSurfaceKHR* pSurface);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateXcbSurfaceKHR)(VkInstance instance, xcb_connection_t* connection, xcb_window_t window, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, xcb_connection_t* connection, xcb_visualid_t visual_id);
#ifdef VK_PROTOTYPES
@@ -3452,6 +3458,7 @@
VkInstance instance,
xcb_connection_t* connection,
xcb_window_t window,
+ const VkAllocationCallbacks* pAllocator,
VkSurfaceKHR* pSurface);
VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceXcbPresentationSupportKHR(
@@ -3466,11 +3473,11 @@
#define VK_KHR_wayland_surface 1
#include <wayland-client.h>
-#define VK_KHR_WAYLAND_SURFACE_REVISION 3
+#define VK_KHR_WAYLAND_SURFACE_REVISION 4
#define VK_KHR_WAYLAND_SURFACE_EXTENSION_NUMBER 7
#define VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME "VK_KHR_wayland_surface"
-typedef VkResult (VKAPI_PTR *PFN_vkCreateWaylandSurfaceKHR)(VkInstance instance, struct wl_display* display, struct wl_surface* surface, VkSurfaceKHR* pSurface);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateWaylandSurfaceKHR)(VkInstance instance, struct wl_display* display, struct wl_surface* surface, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, struct wl_display* display);
#ifdef VK_PROTOTYPES
@@ -3478,6 +3485,7 @@
VkInstance instance,
struct wl_display* display,
struct wl_surface* surface,
+ const VkAllocationCallbacks* pAllocator,
VkSurfaceKHR* pSurface);
VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceWaylandPresentationSupportKHR(
@@ -3491,11 +3499,11 @@
#define VK_KHR_mir_surface 1
#include <mir_toolkit/client_types.h>
-#define VK_KHR_MIR_SURFACE_REVISION 3
+#define VK_KHR_MIR_SURFACE_REVISION 4
#define VK_KHR_MIR_SURFACE_EXTENSION_NUMBER 8
#define VK_KHR_MIR_SURFACE_EXTENSION_NAME "VK_KHR_mir_surface"
-typedef VkResult (VKAPI_PTR *PFN_vkCreateMirSurfaceKHR)(VkInstance instance, MirConnection* connection, MirSurface* mirSurface, VkSurfaceKHR* pSurface);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateMirSurfaceKHR)(VkInstance instance, MirConnection* connection, MirSurface* mirSurface, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceMirPresentationSupportKHR)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, MirConnection* connection);
#ifdef VK_PROTOTYPES
@@ -3503,6 +3511,7 @@
VkInstance instance,
MirConnection* connection,
MirSurface* mirSurface,
+ const VkAllocationCallbacks* pAllocator,
VkSurfaceKHR* pSurface);
VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceMirPresentationSupportKHR(
@@ -3516,18 +3525,19 @@
#define VK_KHR_android_surface 1
#include <android/native_window.h>
-#define VK_KHR_ANDROID_SURFACE_REVISION 2
+#define VK_KHR_ANDROID_SURFACE_REVISION 3
#define VK_KHR_ANDROID_SURFACE_EXTENSION_NUMBER 9
#define VK_KHR_ANDROID_SURFACE_EXTENSION_NAME "VK_KHR_android_surface"
#define VK_ERROR_INVALID_ANDROID_WINDOW_KHR ((VkResult)(int)0xc0002400)
#define VK_ERROR_ANDROID_WINDOW_IN_USE_KHR ((VkResult)(int)0xc0002401)
-typedef VkResult (VKAPI_PTR *PFN_vkCreateAndroidSurfaceKHR)(VkInstance instance, ANativeWindow* window, VkSurfaceKHR* pSurface);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateAndroidSurfaceKHR)(VkInstance instance, ANativeWindow* window, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
#ifdef VK_PROTOTYPES
VKAPI_ATTR VkResult VKAPI_CALL vkCreateAndroidSurfaceKHR(
VkInstance instance,
ANativeWindow* window,
+ const VkAllocationCallbacks* pAllocator,
VkSurfaceKHR* pSurface);
#endif
#endif /* VK_USE_PLATFORM_ANDROID_KHR */
@@ -3536,11 +3546,11 @@
#define VK_KHR_win32_surface 1
#include <windows.h>
-#define VK_KHR_WIN32_SURFACE_REVISION 3
+#define VK_KHR_WIN32_SURFACE_REVISION 4
#define VK_KHR_WIN32_SURFACE_EXTENSION_NUMBER 10
#define VK_KHR_WIN32_SURFACE_EXTENSION_NAME "VK_KHR_win32_surface"
-typedef VkResult (VKAPI_PTR *PFN_vkCreateWin32SurfaceKHR)(VkInstance instance, HINSTANCE hinstance, HWND hwnd, VkSurfaceKHR* pSurface);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateWin32SurfaceKHR)(VkInstance instance, HINSTANCE hinstance, HWND hwnd, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex);
#ifdef VK_PROTOTYPES
@@ -3548,6 +3558,7 @@
VkInstance instance,
HINSTANCE hinstance,
HWND hwnd,
+ const VkAllocationCallbacks* pAllocator,
VkSurfaceKHR* pSurface);
VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceWin32PresentationSupportKHR(
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;