| diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h |
| index cf9d85a..42c4a3d 100644 |
| --- a/include/vulkan/vulkan.h |
| +++ b/include/vulkan/vulkan.h |
| @@ -24,7 +24,7 @@ |
| #include "vulkan_android.h" |
| #endif |
| |
| -#ifdef VK_USE_PLATFORM_FUCHSIA |
| +#if defined(VK_USE_PLATFORM_FUCHSIA) || defined(VK_USE_PLATFORM_MAGMA_KHR) |
| #include <zircon/types.h> |
| #include "vulkan_fuchsia.h" |
| #endif |
| diff --git a/xml/genvk.py b/xml/genvk.py |
| index cdbf938..f3894c8 100755 |
| --- a/xml/genvk.py |
| +++ b/xml/genvk.py |
| @@ -30,11 +30,11 @@ startTime = None |
| |
| def startTimer(timeit): |
| global startTime |
| - startTime = time.clock() |
| + startTime = time.process_time() |
| |
| def endTimer(timeit, msg): |
| global startTime |
| - endTime = time.clock() |
| + endTime = time.process_time() |
| if (timeit): |
| write(msg, endTime - startTime, file=sys.stderr) |
| startTime = None |
| @@ -254,7 +254,11 @@ def makeGenOpts(args): |
| [ 'vulkan_android.h', [ 'VK_KHR_android_surface', |
| 'VK_ANDROID_external_memory_android_hardware_buffer' |
| ], commonSuppressExtensions ], |
| - [ 'vulkan_fuchsia.h', [ 'VK_FUCHSIA_imagepipe_surface'], commonSuppressExtensions ], |
| + [ 'vulkan_fuchsia.h', [ 'VK_KHR_magma_surface', |
| + 'VK_FUCHSIA_imagepipe_surface', |
| + 'VK_GOOGLE_image_usage_scanout', |
| + 'VK_KHR_external_memory_fuchsia', |
| + 'VK_KHR_external_semaphore_fuchsia'], commonSuppressExtensions ], |
| [ 'vulkan_ios.h', [ 'VK_MVK_ios_surface' ], commonSuppressExtensions ], |
| [ 'vulkan_macos.h', [ 'VK_MVK_macos_surface' ], commonSuppressExtensions ], |
| [ 'vulkan_mir.h', [ 'VK_KHR_mir_surface' ], commonSuppressExtensions ], |
