From d49ab4d30781377ca7aeb6f11700da721915657e Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 17 Dec 2019 18:06:03 +0000 Subject: [PATCH] Update vulkan platform headers to latest * Minor formatting changes mostly --- renderdoc/driver/vulkan/official/vulkan_android.h | 9 +++++---- renderdoc/driver/vulkan/official/vulkan_fuchsia.h | 9 +++++---- renderdoc/driver/vulkan/official/vulkan_ggp.h | 9 +++++---- renderdoc/driver/vulkan/official/vulkan_ios.h | 9 +++++---- renderdoc/driver/vulkan/official/vulkan_macos.h | 9 +++++---- renderdoc/driver/vulkan/official/vulkan_metal.h | 9 +++++---- renderdoc/driver/vulkan/official/vulkan_vi.h | 9 +++++---- renderdoc/driver/vulkan/official/vulkan_wayland.h | 9 +++++---- renderdoc/driver/vulkan/official/vulkan_win32.h | 13 +++++++------ renderdoc/driver/vulkan/official/vulkan_xcb.h | 9 +++++---- renderdoc/driver/vulkan/official/vulkan_xlib.h | 9 +++++---- .../driver/vulkan/official/vulkan_xlib_xrandr.h | 9 +++++---- 12 files changed, 62 insertions(+), 50 deletions(-) diff --git a/renderdoc/driver/vulkan/official/vulkan_android.h b/renderdoc/driver/vulkan/official/vulkan_android.h index 186180241..9b8d3e276 100644 --- a/renderdoc/driver/vulkan/official/vulkan_android.h +++ b/renderdoc/driver/vulkan/official/vulkan_android.h @@ -1,10 +1,6 @@ #ifndef VULKAN_ANDROID_H_ #define VULKAN_ANDROID_H_ 1 -#ifdef __cplusplus -extern "C" { -#endif - /* ** Copyright (c) 2015-2019 The Khronos Group Inc. ** @@ -27,6 +23,11 @@ extern "C" { */ +#ifdef __cplusplus +extern "C" { +#endif + + #define VK_KHR_android_surface 1 struct ANativeWindow; diff --git a/renderdoc/driver/vulkan/official/vulkan_fuchsia.h b/renderdoc/driver/vulkan/official/vulkan_fuchsia.h index 4c62a7c2f..81ebe55d3 100644 --- a/renderdoc/driver/vulkan/official/vulkan_fuchsia.h +++ b/renderdoc/driver/vulkan/official/vulkan_fuchsia.h @@ -1,10 +1,6 @@ #ifndef VULKAN_FUCHSIA_H_ #define VULKAN_FUCHSIA_H_ 1 -#ifdef __cplusplus -extern "C" { -#endif - /* ** Copyright (c) 2015-2019 The Khronos Group Inc. ** @@ -27,6 +23,11 @@ extern "C" { */ +#ifdef __cplusplus +extern "C" { +#endif + + #define VK_FUCHSIA_imagepipe_surface 1 #define VK_FUCHSIA_IMAGEPIPE_SURFACE_SPEC_VERSION 1 diff --git a/renderdoc/driver/vulkan/official/vulkan_ggp.h b/renderdoc/driver/vulkan/official/vulkan_ggp.h index 3d67c4b8c..fd306131c 100644 --- a/renderdoc/driver/vulkan/official/vulkan_ggp.h +++ b/renderdoc/driver/vulkan/official/vulkan_ggp.h @@ -1,10 +1,6 @@ #ifndef VULKAN_GGP_H_ #define VULKAN_GGP_H_ 1 -#ifdef __cplusplus -extern "C" { -#endif - /* ** Copyright (c) 2015-2019 The Khronos Group Inc. ** @@ -27,6 +23,11 @@ extern "C" { */ +#ifdef __cplusplus +extern "C" { +#endif + + #define VK_GGP_stream_descriptor_surface 1 #define VK_GGP_STREAM_DESCRIPTOR_SURFACE_SPEC_VERSION 1 diff --git a/renderdoc/driver/vulkan/official/vulkan_ios.h b/renderdoc/driver/vulkan/official/vulkan_ios.h index 1846df52d..72ef1a8a8 100644 --- a/renderdoc/driver/vulkan/official/vulkan_ios.h +++ b/renderdoc/driver/vulkan/official/vulkan_ios.h @@ -1,10 +1,6 @@ #ifndef VULKAN_IOS_H_ #define VULKAN_IOS_H_ 1 -#ifdef __cplusplus -extern "C" { -#endif - /* ** Copyright (c) 2015-2019 The Khronos Group Inc. ** @@ -27,6 +23,11 @@ extern "C" { */ +#ifdef __cplusplus +extern "C" { +#endif + + #define VK_MVK_ios_surface 1 #define VK_MVK_IOS_SURFACE_SPEC_VERSION 2 diff --git a/renderdoc/driver/vulkan/official/vulkan_macos.h b/renderdoc/driver/vulkan/official/vulkan_macos.h index dca623b04..e6e5deaa3 100644 --- a/renderdoc/driver/vulkan/official/vulkan_macos.h +++ b/renderdoc/driver/vulkan/official/vulkan_macos.h @@ -1,10 +1,6 @@ #ifndef VULKAN_MACOS_H_ #define VULKAN_MACOS_H_ 1 -#ifdef __cplusplus -extern "C" { -#endif - /* ** Copyright (c) 2015-2019 The Khronos Group Inc. ** @@ -27,6 +23,11 @@ extern "C" { */ +#ifdef __cplusplus +extern "C" { +#endif + + #define VK_MVK_macos_surface 1 #define VK_MVK_MACOS_SURFACE_SPEC_VERSION 2 diff --git a/renderdoc/driver/vulkan/official/vulkan_metal.h b/renderdoc/driver/vulkan/official/vulkan_metal.h index 16505237d..3dec68c77 100644 --- a/renderdoc/driver/vulkan/official/vulkan_metal.h +++ b/renderdoc/driver/vulkan/official/vulkan_metal.h @@ -1,10 +1,6 @@ #ifndef VULKAN_METAL_H_ #define VULKAN_METAL_H_ 1 -#ifdef __cplusplus -extern "C" { -#endif - /* ** Copyright (c) 2015-2019 The Khronos Group Inc. ** @@ -27,6 +23,11 @@ extern "C" { */ +#ifdef __cplusplus +extern "C" { +#endif + + #define VK_EXT_metal_surface 1 diff --git a/renderdoc/driver/vulkan/official/vulkan_vi.h b/renderdoc/driver/vulkan/official/vulkan_vi.h index 50aa27dfb..6fb66f9dd 100644 --- a/renderdoc/driver/vulkan/official/vulkan_vi.h +++ b/renderdoc/driver/vulkan/official/vulkan_vi.h @@ -1,10 +1,6 @@ #ifndef VULKAN_VI_H_ #define VULKAN_VI_H_ 1 -#ifdef __cplusplus -extern "C" { -#endif - /* ** Copyright (c) 2015-2019 The Khronos Group Inc. ** @@ -27,6 +23,11 @@ extern "C" { */ +#ifdef __cplusplus +extern "C" { +#endif + + #define VK_NN_vi_surface 1 #define VK_NN_VI_SURFACE_SPEC_VERSION 1 diff --git a/renderdoc/driver/vulkan/official/vulkan_wayland.h b/renderdoc/driver/vulkan/official/vulkan_wayland.h index 12a5f045c..599d05b24 100644 --- a/renderdoc/driver/vulkan/official/vulkan_wayland.h +++ b/renderdoc/driver/vulkan/official/vulkan_wayland.h @@ -1,10 +1,6 @@ #ifndef VULKAN_WAYLAND_H_ #define VULKAN_WAYLAND_H_ 1 -#ifdef __cplusplus -extern "C" { -#endif - /* ** Copyright (c) 2015-2019 The Khronos Group Inc. ** @@ -27,6 +23,11 @@ extern "C" { */ +#ifdef __cplusplus +extern "C" { +#endif + + #define VK_KHR_wayland_surface 1 #define VK_KHR_WAYLAND_SURFACE_SPEC_VERSION 6 diff --git a/renderdoc/driver/vulkan/official/vulkan_win32.h b/renderdoc/driver/vulkan/official/vulkan_win32.h index a61a7d885..20a1dc0e5 100644 --- a/renderdoc/driver/vulkan/official/vulkan_win32.h +++ b/renderdoc/driver/vulkan/official/vulkan_win32.h @@ -1,10 +1,6 @@ #ifndef VULKAN_WIN32_H_ #define VULKAN_WIN32_H_ 1 -#ifdef __cplusplus -extern "C" { -#endif - /* ** Copyright (c) 2015-2019 The Khronos Group Inc. ** @@ -27,6 +23,11 @@ extern "C" { */ +#ifdef __cplusplus +extern "C" { +#endif + + #define VK_KHR_win32_surface 1 #define VK_KHR_WIN32_SURFACE_SPEC_VERSION 6 @@ -246,7 +247,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryWin32HandleNV( #define VK_NV_win32_keyed_mutex 1 -#define VK_NV_WIN32_KEYED_MUTEX_SPEC_VERSION 1 +#define VK_NV_WIN32_KEYED_MUTEX_SPEC_VERSION 2 #define VK_NV_WIN32_KEYED_MUTEX_EXTENSION_NAME "VK_NV_win32_keyed_mutex" typedef struct VkWin32KeyedMutexAcquireReleaseInfoNV { VkStructureType sType; @@ -263,7 +264,7 @@ typedef struct VkWin32KeyedMutexAcquireReleaseInfoNV { #define VK_EXT_full_screen_exclusive 1 -#define VK_EXT_FULL_SCREEN_EXCLUSIVE_SPEC_VERSION 3 +#define VK_EXT_FULL_SCREEN_EXCLUSIVE_SPEC_VERSION 4 #define VK_EXT_FULL_SCREEN_EXCLUSIVE_EXTENSION_NAME "VK_EXT_full_screen_exclusive" typedef enum VkFullScreenExclusiveEXT { diff --git a/renderdoc/driver/vulkan/official/vulkan_xcb.h b/renderdoc/driver/vulkan/official/vulkan_xcb.h index 7d6905d2d..4cc0bc0ce 100644 --- a/renderdoc/driver/vulkan/official/vulkan_xcb.h +++ b/renderdoc/driver/vulkan/official/vulkan_xcb.h @@ -1,10 +1,6 @@ #ifndef VULKAN_XCB_H_ #define VULKAN_XCB_H_ 1 -#ifdef __cplusplus -extern "C" { -#endif - /* ** Copyright (c) 2015-2019 The Khronos Group Inc. ** @@ -27,6 +23,11 @@ extern "C" { */ +#ifdef __cplusplus +extern "C" { +#endif + + #define VK_KHR_xcb_surface 1 #define VK_KHR_XCB_SURFACE_SPEC_VERSION 6 diff --git a/renderdoc/driver/vulkan/official/vulkan_xlib.h b/renderdoc/driver/vulkan/official/vulkan_xlib.h index 7a05d297d..ee2b48acc 100644 --- a/renderdoc/driver/vulkan/official/vulkan_xlib.h +++ b/renderdoc/driver/vulkan/official/vulkan_xlib.h @@ -1,10 +1,6 @@ #ifndef VULKAN_XLIB_H_ #define VULKAN_XLIB_H_ 1 -#ifdef __cplusplus -extern "C" { -#endif - /* ** Copyright (c) 2015-2019 The Khronos Group Inc. ** @@ -27,6 +23,11 @@ extern "C" { */ +#ifdef __cplusplus +extern "C" { +#endif + + #define VK_KHR_xlib_surface 1 #define VK_KHR_XLIB_SURFACE_SPEC_VERSION 6 diff --git a/renderdoc/driver/vulkan/official/vulkan_xlib_xrandr.h b/renderdoc/driver/vulkan/official/vulkan_xlib_xrandr.h index 3a2095308..08c4fd729 100644 --- a/renderdoc/driver/vulkan/official/vulkan_xlib_xrandr.h +++ b/renderdoc/driver/vulkan/official/vulkan_xlib_xrandr.h @@ -1,10 +1,6 @@ #ifndef VULKAN_XLIB_XRANDR_H_ #define VULKAN_XLIB_XRANDR_H_ 1 -#ifdef __cplusplus -extern "C" { -#endif - /* ** Copyright (c) 2015-2019 The Khronos Group Inc. ** @@ -27,6 +23,11 @@ extern "C" { */ +#ifdef __cplusplus +extern "C" { +#endif + + #define VK_EXT_acquire_xlib_display 1 #define VK_EXT_ACQUIRE_XLIB_DISPLAY_SPEC_VERSION 1