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 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 14 deletions(-) (limited to 'common/vulkan_wrapper.cpp') 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 -- cgit v1.2.3