From eb3d67bd17ee433e2b0a8e56a7249bd83908812e Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Mon, 19 Apr 2021 08:30:33 -0700 Subject: build: Update to header 1.2.176 - Update known-good - Generate source - Fix scripts/generate_vulkan_wrapper.py - Handle new version macros in vulkan_core.h - Recognize beta/provisional platform guard - Skip extensions without commands Change-Id: Ie1518aaa6fbf6ca996023fbd82f299a48759215e --- common/vulkan_wrapper.cpp | 70 +++++++++++++++++++++++++------- common/vulkan_wrapper.h | 100 +++++++++++----------------------------------- 2 files changed, 80 insertions(+), 90 deletions(-) (limited to 'common') diff --git a/common/vulkan_wrapper.cpp b/common/vulkan_wrapper.cpp index 27510590..f4253eab 100644 --- a/common/vulkan_wrapper.cpp +++ b/common/vulkan_wrapper.cpp @@ -477,9 +477,6 @@ int InitVulkan(void) { reinterpret_cast(dlsym(libvulkan, "vkGetMemoryWin32HandlePropertiesKHR")); #endif -#ifdef VK_USE_PLATFORM_WIN32_KHR -#endif - #ifdef VK_USE_PLATFORM_WIN32_KHR vkImportSemaphoreWin32HandleKHR = reinterpret_cast(dlsym(libvulkan, "vkImportSemaphoreWin32HandleKHR")); @@ -505,7 +502,34 @@ int InitVulkan(void) { dlsym(libvulkan, "vkGetPhysicalDeviceXlibPresentationSupportKHR")); #endif -#ifdef VK_USE_PLATFORM_SCREEN_QNX +#ifdef VK_ENABLE_BETA_EXTENSIONS + vkGetPhysicalDeviceVideoCapabilitiesKHR = + reinterpret_cast(dlsym(libvulkan, "vkGetPhysicalDeviceVideoCapabilitiesKHR")); + vkGetPhysicalDeviceVideoFormatPropertiesKHR = reinterpret_cast( + dlsym(libvulkan, "vkGetPhysicalDeviceVideoFormatPropertiesKHR")); + vkCreateVideoSessionKHR = reinterpret_cast(dlsym(libvulkan, "vkCreateVideoSessionKHR")); + vkDestroyVideoSessionKHR = reinterpret_cast(dlsym(libvulkan, "vkDestroyVideoSessionKHR")); + vkGetVideoSessionMemoryRequirementsKHR = + reinterpret_cast(dlsym(libvulkan, "vkGetVideoSessionMemoryRequirementsKHR")); + vkBindVideoSessionMemoryKHR = + reinterpret_cast(dlsym(libvulkan, "vkBindVideoSessionMemoryKHR")); + vkCreateVideoSessionParametersKHR = + reinterpret_cast(dlsym(libvulkan, "vkCreateVideoSessionParametersKHR")); + vkUpdateVideoSessionParametersKHR = + reinterpret_cast(dlsym(libvulkan, "vkUpdateVideoSessionParametersKHR")); + vkDestroyVideoSessionParametersKHR = + reinterpret_cast(dlsym(libvulkan, "vkDestroyVideoSessionParametersKHR")); + vkCmdBeginVideoCodingKHR = reinterpret_cast(dlsym(libvulkan, "vkCmdBeginVideoCodingKHR")); + vkCmdEndVideoCodingKHR = reinterpret_cast(dlsym(libvulkan, "vkCmdEndVideoCodingKHR")); + vkCmdControlVideoCodingKHR = reinterpret_cast(dlsym(libvulkan, "vkCmdControlVideoCodingKHR")); +#endif + +#ifdef VK_ENABLE_BETA_EXTENSIONS + vkCmdDecodeVideoKHR = reinterpret_cast(dlsym(libvulkan, "vkCmdDecodeVideoKHR")); +#endif + +#ifdef VK_ENABLE_BETA_EXTENSIONS + vkCmdEncodeVideoKHR = reinterpret_cast(dlsym(libvulkan, "vkCmdEncodeVideoKHR")); #endif return 1; } @@ -912,6 +936,13 @@ PFN_vkGetPrivateDataEXT vkGetPrivateDataEXT; PFN_vkCmdSetFragmentShadingRateEnumNV vkCmdSetFragmentShadingRateEnumNV; PFN_vkAcquireWinrtDisplayNV vkAcquireWinrtDisplayNV; PFN_vkGetWinrtDisplayNV vkGetWinrtDisplayNV; +PFN_vkCmdSetVertexInputEXT vkCmdSetVertexInputEXT; +PFN_vkCmdSetPatchControlPointsEXT vkCmdSetPatchControlPointsEXT; +PFN_vkCmdSetRasterizerDiscardEnableEXT vkCmdSetRasterizerDiscardEnableEXT; +PFN_vkCmdSetDepthBiasEnableEXT vkCmdSetDepthBiasEnableEXT; +PFN_vkCmdSetLogicOpEXT vkCmdSetLogicOpEXT; +PFN_vkCmdSetPrimitiveRestartEnableEXT vkCmdSetPrimitiveRestartEnableEXT; +PFN_vkCmdSetColorWriteEnableEXT vkCmdSetColorWriteEnableEXT; PFN_vkCreateAccelerationStructureKHR vkCreateAccelerationStructureKHR; PFN_vkDestroyAccelerationStructureKHR vkDestroyAccelerationStructureKHR; PFN_vkCmdBuildAccelerationStructuresKHR vkCmdBuildAccelerationStructuresKHR; @@ -989,9 +1020,6 @@ PFN_vkGetMemoryWin32HandleKHR vkGetMemoryWin32HandleKHR; PFN_vkGetMemoryWin32HandlePropertiesKHR vkGetMemoryWin32HandlePropertiesKHR; #endif -#ifdef VK_USE_PLATFORM_WIN32_KHR -#endif - #ifdef VK_USE_PLATFORM_WIN32_KHR PFN_vkImportSemaphoreWin32HandleKHR vkImportSemaphoreWin32HandleKHR; PFN_vkGetSemaphoreWin32HandleKHR vkGetSemaphoreWin32HandleKHR; @@ -1006,9 +1034,6 @@ PFN_vkGetFenceWin32HandleKHR vkGetFenceWin32HandleKHR; PFN_vkGetMemoryWin32HandleNV vkGetMemoryWin32HandleNV; #endif -#ifdef VK_USE_PLATFORM_WIN32_KHR -#endif - #ifdef VK_USE_PLATFORM_WIN32_KHR PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT vkGetPhysicalDeviceSurfacePresentModes2EXT; PFN_vkAcquireFullScreenExclusiveModeEXT vkAcquireFullScreenExclusiveModeEXT; @@ -1040,15 +1065,32 @@ PFN_vkGetRandROutputDisplayEXT vkGetRandROutputDisplayEXT; PFN_vkCreateStreamDescriptorSurfaceGGP vkCreateStreamDescriptorSurfaceGGP; #endif -#ifdef VK_USE_PLATFORM_GGP -#endif - #ifdef VK_USE_PLATFORM_SCREEN_QNX PFN_vkCreateScreenSurfaceQNX vkCreateScreenSurfaceQNX; PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX vkGetPhysicalDeviceScreenPresentationSupportQNX; #endif -#ifdef VK_USE_PLATFORM_SCREEN_QNX +#ifdef VK_ENABLE_BETA_EXTENSIONS +PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR vkGetPhysicalDeviceVideoCapabilitiesKHR; +PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR vkGetPhysicalDeviceVideoFormatPropertiesKHR; +PFN_vkCreateVideoSessionKHR vkCreateVideoSessionKHR; +PFN_vkDestroyVideoSessionKHR vkDestroyVideoSessionKHR; +PFN_vkGetVideoSessionMemoryRequirementsKHR vkGetVideoSessionMemoryRequirementsKHR; +PFN_vkBindVideoSessionMemoryKHR vkBindVideoSessionMemoryKHR; +PFN_vkCreateVideoSessionParametersKHR vkCreateVideoSessionParametersKHR; +PFN_vkUpdateVideoSessionParametersKHR vkUpdateVideoSessionParametersKHR; +PFN_vkDestroyVideoSessionParametersKHR vkDestroyVideoSessionParametersKHR; +PFN_vkCmdBeginVideoCodingKHR vkCmdBeginVideoCodingKHR; +PFN_vkCmdEndVideoCodingKHR vkCmdEndVideoCodingKHR; +PFN_vkCmdControlVideoCodingKHR vkCmdControlVideoCodingKHR; +#endif + +#ifdef VK_ENABLE_BETA_EXTENSIONS +PFN_vkCmdDecodeVideoKHR vkCmdDecodeVideoKHR; +#endif + +#ifdef VK_ENABLE_BETA_EXTENSIONS +PFN_vkCmdEncodeVideoKHR vkCmdEncodeVideoKHR; #endif #ifdef __cplusplus diff --git a/common/vulkan_wrapper.h b/common/vulkan_wrapper.h index 3329827c..8a424254 100644 --- a/common/vulkan_wrapper.h +++ b/common/vulkan_wrapper.h @@ -243,10 +243,6 @@ extern PFN_vkCreateDisplayPlaneSurfaceKHR vkCreateDisplayPlaneSurfaceKHR; // VK_KHR_display_swapchain extern PFN_vkCreateSharedSwapchainsKHR vkCreateSharedSwapchainsKHR; -// VK_KHR_sampler_mirror_clamp_to_edge - -// VK_KHR_multiview - // VK_KHR_get_physical_device_properties2 extern PFN_vkGetPhysicalDeviceFeatures2KHR vkGetPhysicalDeviceFeatures2KHR; extern PFN_vkGetPhysicalDeviceProperties2KHR vkGetPhysicalDeviceProperties2KHR; @@ -261,8 +257,6 @@ extern PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR vkGetDeviceGroupPeerMemoryFeatu extern PFN_vkCmdSetDeviceMaskKHR vkCmdSetDeviceMaskKHR; extern PFN_vkCmdDispatchBaseKHR vkCmdDispatchBaseKHR; -// VK_KHR_shader_draw_parameters - // VK_KHR_maintenance1 extern PFN_vkTrimCommandPoolKHR vkTrimCommandPoolKHR; @@ -272,8 +266,6 @@ extern PFN_vkEnumeratePhysicalDeviceGroupsKHR vkEnumeratePhysicalDeviceGroupsKHR // VK_KHR_external_memory_capabilities extern PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR vkGetPhysicalDeviceExternalBufferPropertiesKHR; -// VK_KHR_external_memory - // VK_KHR_external_memory_fd extern PFN_vkGetMemoryFdKHR vkGetMemoryFdKHR; extern PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHR; @@ -281,8 +273,6 @@ extern PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHR; // VK_KHR_external_semaphore_capabilities extern PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR vkGetPhysicalDeviceExternalSemaphorePropertiesKHR; -// VK_KHR_external_semaphore - // VK_KHR_external_semaphore_fd extern PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHR; extern PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHR; @@ -291,19 +281,11 @@ extern PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHR; extern PFN_vkCmdPushDescriptorSetKHR vkCmdPushDescriptorSetKHR; extern PFN_vkCmdPushDescriptorSetWithTemplateKHR vkCmdPushDescriptorSetWithTemplateKHR; -// VK_KHR_shader_float16_int8 - -// VK_KHR_16bit_storage - -// VK_KHR_incremental_present - // VK_KHR_descriptor_update_template extern PFN_vkCreateDescriptorUpdateTemplateKHR vkCreateDescriptorUpdateTemplateKHR; extern PFN_vkDestroyDescriptorUpdateTemplateKHR vkDestroyDescriptorUpdateTemplateKHR; extern PFN_vkUpdateDescriptorSetWithTemplateKHR vkUpdateDescriptorSetWithTemplateKHR; -// VK_KHR_imageless_framebuffer - // VK_KHR_create_renderpass2 extern PFN_vkCreateRenderPass2KHR vkCreateRenderPass2KHR; extern PFN_vkCmdBeginRenderPass2KHR vkCmdBeginRenderPass2KHR; @@ -316,8 +298,6 @@ extern PFN_vkGetSwapchainStatusKHR vkGetSwapchainStatusKHR; // VK_KHR_external_fence_capabilities extern PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR vkGetPhysicalDeviceExternalFencePropertiesKHR; -// VK_KHR_external_fence - // VK_KHR_external_fence_fd extern PFN_vkImportFenceFdKHR vkImportFenceFdKHR; extern PFN_vkGetFenceFdKHR vkGetFenceFdKHR; @@ -329,33 +309,21 @@ extern PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR vkGetPhysical extern PFN_vkAcquireProfilingLockKHR vkAcquireProfilingLockKHR; extern PFN_vkReleaseProfilingLockKHR vkReleaseProfilingLockKHR; -// VK_KHR_maintenance2 - // VK_KHR_get_surface_capabilities2 extern PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR vkGetPhysicalDeviceSurfaceCapabilities2KHR; extern PFN_vkGetPhysicalDeviceSurfaceFormats2KHR vkGetPhysicalDeviceSurfaceFormats2KHR; -// VK_KHR_variable_pointers - // VK_KHR_get_display_properties2 extern PFN_vkGetPhysicalDeviceDisplayProperties2KHR vkGetPhysicalDeviceDisplayProperties2KHR; extern PFN_vkGetPhysicalDeviceDisplayPlaneProperties2KHR vkGetPhysicalDeviceDisplayPlaneProperties2KHR; extern PFN_vkGetDisplayModeProperties2KHR vkGetDisplayModeProperties2KHR; extern PFN_vkGetDisplayPlaneCapabilities2KHR vkGetDisplayPlaneCapabilities2KHR; -// VK_KHR_dedicated_allocation - -// VK_KHR_storage_buffer_storage_class - -// VK_KHR_relaxed_block_layout - // VK_KHR_get_memory_requirements2 extern PFN_vkGetImageMemoryRequirements2KHR vkGetImageMemoryRequirements2KHR; extern PFN_vkGetBufferMemoryRequirements2KHR vkGetBufferMemoryRequirements2KHR; extern PFN_vkGetImageSparseMemoryRequirements2KHR vkGetImageSparseMemoryRequirements2KHR; -// VK_KHR_image_format_list - // VK_KHR_sampler_ycbcr_conversion extern PFN_vkCreateSamplerYcbcrConversionKHR vkCreateSamplerYcbcrConversionKHR; extern PFN_vkDestroySamplerYcbcrConversionKHR vkDestroySamplerYcbcrConversionKHR; @@ -371,43 +339,15 @@ extern PFN_vkGetDescriptorSetLayoutSupportKHR vkGetDescriptorSetLayoutSupportKHR extern PFN_vkCmdDrawIndirectCountKHR vkCmdDrawIndirectCountKHR; extern PFN_vkCmdDrawIndexedIndirectCountKHR vkCmdDrawIndexedIndirectCountKHR; -// VK_KHR_shader_subgroup_extended_types - -// VK_KHR_8bit_storage - -// VK_KHR_shader_atomic_int64 - -// VK_KHR_shader_clock - -// VK_KHR_driver_properties - -// VK_KHR_shader_float_controls - -// VK_KHR_depth_stencil_resolve - -// VK_KHR_swapchain_mutable_format - // VK_KHR_timeline_semaphore extern PFN_vkGetSemaphoreCounterValueKHR vkGetSemaphoreCounterValueKHR; extern PFN_vkWaitSemaphoresKHR vkWaitSemaphoresKHR; extern PFN_vkSignalSemaphoreKHR vkSignalSemaphoreKHR; -// VK_KHR_vulkan_memory_model - -// VK_KHR_shader_terminate_invocation - // VK_KHR_fragment_shading_rate extern PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR vkGetPhysicalDeviceFragmentShadingRatesKHR; extern PFN_vkCmdSetFragmentShadingRateKHR vkCmdSetFragmentShadingRateKHR; -// VK_KHR_spirv_1_4 - -// VK_KHR_surface_protected_capabilities - -// VK_KHR_separate_depth_stencil_layouts - -// VK_KHR_uniform_buffer_standard_layout - // VK_KHR_buffer_device_address extern PFN_vkGetBufferDeviceAddressKHR vkGetBufferDeviceAddressKHR; extern PFN_vkGetBufferOpaqueCaptureAddressKHR vkGetBufferOpaqueCaptureAddressKHR; @@ -425,10 +365,6 @@ extern PFN_vkGetPipelineExecutablePropertiesKHR vkGetPipelineExecutablePropertie extern PFN_vkGetPipelineExecutableStatisticsKHR vkGetPipelineExecutableStatisticsKHR; extern PFN_vkGetPipelineExecutableInternalRepresentationsKHR vkGetPipelineExecutableInternalRepresentationsKHR; -// VK_KHR_pipeline_library - -// VK_KHR_shader_non_semantic_info - // VK_KHR_synchronization2 extern PFN_vkCmdSetEvent2KHR vkCmdSetEvent2KHR; extern PFN_vkCmdResetEvent2KHR vkCmdResetEvent2KHR; @@ -439,10 +375,6 @@ extern PFN_vkQueueSubmit2KHR vkQueueSubmit2KHR; extern PFN_vkCmdWriteBufferMarker2AMD vkCmdWriteBufferMarker2AMD; extern PFN_vkGetQueueCheckpointData2NV vkGetQueueCheckpointData2NV; -// VK_KHR_zero_initialize_workgroup_memory - -// VK_KHR_workgroup_memory_explicit_layout - // VK_KHR_copy_commands2 extern PFN_vkCmdCopyBuffer2KHR vkCmdCopyBuffer2KHR; extern PFN_vkCmdCopyImage2KHR vkCmdCopyImage2KHR; @@ -477,8 +409,6 @@ extern PFN_vkCmdTraceRaysIndirectKHR vkCmdTraceRaysIndirectKHR; extern PFN_vkGetRayTracingShaderGroupStackSizeKHR vkGetRayTracingShaderGroupStackSizeKHR; extern PFN_vkCmdSetRayTracingPipelineStackSizeKHR vkCmdSetRayTracingPipelineStackSizeKHR; -// VK_KHR_ray_query - #ifdef VK_USE_PLATFORM_ANDROID_KHR // VK_KHR_android_surface extern PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR; @@ -502,10 +432,6 @@ extern PFN_vkGetMemoryWin32HandleKHR vkGetMemoryWin32HandleKHR; extern PFN_vkGetMemoryWin32HandlePropertiesKHR vkGetMemoryWin32HandlePropertiesKHR; #endif -#ifdef VK_USE_PLATFORM_WIN32_KHR -// VK_KHR_win32_keyed_mutex -#endif - #ifdef VK_USE_PLATFORM_WIN32_KHR // VK_KHR_external_semaphore_win32 extern PFN_vkImportSemaphoreWin32HandleKHR vkImportSemaphoreWin32HandleKHR; @@ -530,8 +456,30 @@ extern PFN_vkCreateXlibSurfaceKHR vkCreateXlibSurfaceKHR; extern PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR; #endif -#ifdef VK_USE_PLATFORM_SCREEN_QNX -// VK_KHR_portability_subset +#ifdef VK_ENABLE_BETA_EXTENSIONS +// VK_KHR_video_queue +extern PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR vkGetPhysicalDeviceVideoCapabilitiesKHR; +extern PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR vkGetPhysicalDeviceVideoFormatPropertiesKHR; +extern PFN_vkCreateVideoSessionKHR vkCreateVideoSessionKHR; +extern PFN_vkDestroyVideoSessionKHR vkDestroyVideoSessionKHR; +extern PFN_vkGetVideoSessionMemoryRequirementsKHR vkGetVideoSessionMemoryRequirementsKHR; +extern PFN_vkBindVideoSessionMemoryKHR vkBindVideoSessionMemoryKHR; +extern PFN_vkCreateVideoSessionParametersKHR vkCreateVideoSessionParametersKHR; +extern PFN_vkUpdateVideoSessionParametersKHR vkUpdateVideoSessionParametersKHR; +extern PFN_vkDestroyVideoSessionParametersKHR vkDestroyVideoSessionParametersKHR; +extern PFN_vkCmdBeginVideoCodingKHR vkCmdBeginVideoCodingKHR; +extern PFN_vkCmdEndVideoCodingKHR vkCmdEndVideoCodingKHR; +extern PFN_vkCmdControlVideoCodingKHR vkCmdControlVideoCodingKHR; +#endif + +#ifdef VK_ENABLE_BETA_EXTENSIONS +// VK_KHR_video_decode_queue +extern PFN_vkCmdDecodeVideoKHR vkCmdDecodeVideoKHR; +#endif + +#ifdef VK_ENABLE_BETA_EXTENSIONS +// VK_KHR_video_encode_queue +extern PFN_vkCmdEncodeVideoKHR vkCmdEncodeVideoKHR; #endif #ifdef __cplusplus -- cgit v1.2.3