mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-15 11:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

a/vk: Change script to make it clang-format friendly

Browse source
This commit is contained in:
Jakob Bornecrantz 2021-12-03 21:23:21 +00:00 committed by Ryan Pavlik
parent c8c2adc672
commit 7d529a3dfc
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/generate_vk_helpers.py
View file

@ -273,7 +273,7 @@ class ConditionalGenerator:
lines = [] lines = []
if self.current_condition and new_condition != self.current_condition: if self.current_condition and new_condition != self.current_condition:
# Close current condition if required. # Close current condition if required.
lines.append("#endif // {}".format(self.current_condition)) lines.append("#endif // {}".format(self.current_condition))
# empty line # empty line
lines.append("") lines.append("")
self.current_condition = None self.current_condition = None

22
src/xrt/auxiliary/vk/vk_helpers.c
View file

@ -859,38 +859,38 @@ vk_get_instance_functions(struct vk_bundle *vk)
vk->vkGetDisplayModePropertiesKHR = GET_INS_PROC(vk, vkGetDisplayModePropertiesKHR); vk->vkGetDisplayModePropertiesKHR = GET_INS_PROC(vk, vkGetDisplayModePropertiesKHR);
vk->vkReleaseDisplayEXT = GET_INS_PROC(vk, vkReleaseDisplayEXT); vk->vkReleaseDisplayEXT = GET_INS_PROC(vk, vkReleaseDisplayEXT);
#endif // defined(VK_USE_PLATFORM_DISPLAY_KHR) #endif // defined(VK_USE_PLATFORM_DISPLAY_KHR)
#if defined(VK_USE_PLATFORM_XCB_KHR) #if defined(VK_USE_PLATFORM_XCB_KHR)
vk->vkCreateXcbSurfaceKHR = GET_INS_PROC(vk, vkCreateXcbSurfaceKHR); vk->vkCreateXcbSurfaceKHR = GET_INS_PROC(vk, vkCreateXcbSurfaceKHR);
#endif // defined(VK_USE_PLATFORM_XCB_KHR) #endif // defined(VK_USE_PLATFORM_XCB_KHR)
#if defined(VK_USE_PLATFORM_WAYLAND_KHR) #if defined(VK_USE_PLATFORM_WAYLAND_KHR)
vk->vkCreateWaylandSurfaceKHR = GET_INS_PROC(vk, vkCreateWaylandSurfaceKHR); vk->vkCreateWaylandSurfaceKHR = GET_INS_PROC(vk, vkCreateWaylandSurfaceKHR);
#endif // defined(VK_USE_PLATFORM_WAYLAND_KHR) #endif // defined(VK_USE_PLATFORM_WAYLAND_KHR)
#if defined(VK_USE_PLATFORM_WAYLAND_KHR) && defined(VK_EXT_acquire_drm_display) #if defined(VK_USE_PLATFORM_WAYLAND_KHR) && defined(VK_EXT_acquire_drm_display)
vk->vkAcquireDrmDisplayEXT = GET_INS_PROC(vk, vkAcquireDrmDisplayEXT); vk->vkAcquireDrmDisplayEXT = GET_INS_PROC(vk, vkAcquireDrmDisplayEXT);
vk->vkGetDrmDisplayEXT = GET_INS_PROC(vk, vkGetDrmDisplayEXT); vk->vkGetDrmDisplayEXT = GET_INS_PROC(vk, vkGetDrmDisplayEXT);
#endif // defined(VK_USE_PLATFORM_WAYLAND_KHR) && defined(VK_EXT_acquire_drm_display) #endif // defined(VK_USE_PLATFORM_WAYLAND_KHR) && defined(VK_EXT_acquire_drm_display)
#if defined(VK_USE_PLATFORM_XLIB_XRANDR_EXT) #if defined(VK_USE_PLATFORM_XLIB_XRANDR_EXT)
vk->vkGetRandROutputDisplayEXT = GET_INS_PROC(vk, vkGetRandROutputDisplayEXT); vk->vkGetRandROutputDisplayEXT = GET_INS_PROC(vk, vkGetRandROutputDisplayEXT);
vk->vkAcquireXlibDisplayEXT = GET_INS_PROC(vk, vkAcquireXlibDisplayEXT); vk->vkAcquireXlibDisplayEXT = GET_INS_PROC(vk, vkAcquireXlibDisplayEXT);
#endif // defined(VK_USE_PLATFORM_XLIB_XRANDR_EXT) #endif // defined(VK_USE_PLATFORM_XLIB_XRANDR_EXT)
#if defined(VK_USE_PLATFORM_ANDROID_KHR) #if defined(VK_USE_PLATFORM_ANDROID_KHR)
vk->vkCreateAndroidSurfaceKHR = GET_INS_PROC(vk, vkCreateAndroidSurfaceKHR); vk->vkCreateAndroidSurfaceKHR = GET_INS_PROC(vk, vkCreateAndroidSurfaceKHR);
#endif // defined(VK_USE_PLATFORM_ANDROID_KHR) #endif // defined(VK_USE_PLATFORM_ANDROID_KHR)
#if defined(VK_USE_PLATFORM_WIN32_KHR) #if defined(VK_USE_PLATFORM_WIN32_KHR)
vk->vkCreateWin32SurfaceKHR = GET_INS_PROC(vk, vkCreateWin32SurfaceKHR); vk->vkCreateWin32SurfaceKHR = GET_INS_PROC(vk, vkCreateWin32SurfaceKHR);
#endif // defined(VK_USE_PLATFORM_WIN32_KHR) #endif // defined(VK_USE_PLATFORM_WIN32_KHR)
// end of GENERATED instance loader code - do not modify - used by scripts // end of GENERATED instance loader code - do not modify - used by scripts
@ -993,7 +993,7 @@ vk_get_device_functions(struct vk_bundle *vk)
vk->vkCreateSemaphore = GET_DEV_PROC(vk, vkCreateSemaphore); vk->vkCreateSemaphore = GET_DEV_PROC(vk, vkCreateSemaphore);
#if defined(VK_KHR_timeline_semaphore) #if defined(VK_KHR_timeline_semaphore)
vk->vkSignalSemaphore = GET_DEV_PROC(vk, vkSignalSemaphoreKHR); vk->vkSignalSemaphore = GET_DEV_PROC(vk, vkSignalSemaphoreKHR);
#endif // defined(VK_KHR_timeline_semaphore) #endif // defined(VK_KHR_timeline_semaphore)
vk->vkDestroySemaphore = GET_DEV_PROC(vk, vkDestroySemaphore); vk->vkDestroySemaphore = GET_DEV_PROC(vk, vkDestroySemaphore);
@ -1013,7 +1013,7 @@ vk_get_device_functions(struct vk_bundle *vk)
vk->vkGetMemoryWin32HandleKHR = GET_DEV_PROC(vk, vkGetMemoryWin32HandleKHR); vk->vkGetMemoryWin32HandleKHR = GET_DEV_PROC(vk, vkGetMemoryWin32HandleKHR);
vk->vkImportSemaphoreWin32HandleKHR = GET_DEV_PROC(vk, vkImportSemaphoreWin32HandleKHR); vk->vkImportSemaphoreWin32HandleKHR = GET_DEV_PROC(vk, vkImportSemaphoreWin32HandleKHR);
vk->vkImportFenceWin32HandleKHR = GET_DEV_PROC(vk, vkImportFenceWin32HandleKHR); vk->vkImportFenceWin32HandleKHR = GET_DEV_PROC(vk, vkImportFenceWin32HandleKHR);
#endif // defined(VK_USE_PLATFORM_WIN32_KHR) #endif // defined(VK_USE_PLATFORM_WIN32_KHR)
#if !defined(VK_USE_PLATFORM_WIN32_KHR) #if !defined(VK_USE_PLATFORM_WIN32_KHR)
vk->vkGetMemoryFdKHR = GET_DEV_PROC(vk, vkGetMemoryFdKHR); vk->vkGetMemoryFdKHR = GET_DEV_PROC(vk, vkGetMemoryFdKHR);
@ -1023,13 +1023,13 @@ vk_get_device_functions(struct vk_bundle *vk)
vk->vkImportFenceFdKHR = GET_DEV_PROC(vk, vkImportFenceFdKHR); vk->vkImportFenceFdKHR = GET_DEV_PROC(vk, vkImportFenceFdKHR);
vk->vkGetFenceFdKHR = GET_DEV_PROC(vk, vkGetFenceFdKHR); vk->vkGetFenceFdKHR = GET_DEV_PROC(vk, vkGetFenceFdKHR);
#endif // !defined(VK_USE_PLATFORM_WIN32_KHR) #endif // !defined(VK_USE_PLATFORM_WIN32_KHR)
#if defined(VK_USE_PLATFORM_ANDROID_KHR) #if defined(VK_USE_PLATFORM_ANDROID_KHR)
vk->vkGetMemoryAndroidHardwareBufferANDROID = GET_DEV_PROC(vk, vkGetMemoryAndroidHardwareBufferANDROID); vk->vkGetMemoryAndroidHardwareBufferANDROID = GET_DEV_PROC(vk, vkGetMemoryAndroidHardwareBufferANDROID);
vk->vkGetAndroidHardwareBufferPropertiesANDROID = GET_DEV_PROC(vk, vkGetAndroidHardwareBufferPropertiesANDROID); vk->vkGetAndroidHardwareBufferPropertiesANDROID = GET_DEV_PROC(vk, vkGetAndroidHardwareBufferPropertiesANDROID);
#endif // defined(VK_USE_PLATFORM_ANDROID_KHR) #endif // defined(VK_USE_PLATFORM_ANDROID_KHR)
vk->vkGetPastPresentationTimingGOOGLE = GET_DEV_PROC(vk, vkGetPastPresentationTimingGOOGLE); vk->vkGetPastPresentationTimingGOOGLE = GET_DEV_PROC(vk, vkGetPastPresentationTimingGOOGLE);
// end of GENERATED device loader code - do not modify - used by scripts // end of GENERATED device loader code - do not modify - used by scripts