From: Shannon McPherson Date: Tue, 2 Mar 2021 22:45:13 +0000 (-0700) Subject: build: Update known-good files for 1.2.171 header X-Git-Tag: upstream/1.2.179~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=461b33cfa2726ed65fdf3308d0303ae18a879c49;p=platform%2Fupstream%2FVulkan-Tools.git build: Update known-good files for 1.2.171 header Changes: - Updated `known_good.json` - Generated new source files Change-Id: Id1d05f65733d366d729b7f9016a3613e7a795ec9 --- diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index 00fc236..4ee301c 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.2.170 +4fe5828a0295a3c29a266e446ac6a6b51d768e48 diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index f644318..6ab7583 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -4805,6 +4805,29 @@ static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceDirectFBPresentationSuppo #endif /* VK_USE_PLATFORM_DIRECTFB_EXT */ +#ifdef VK_USE_PLATFORM_SCREEN_QNX + +static VKAPI_ATTR VkResult VKAPI_CALL CreateScreenSurfaceQNX( + VkInstance instance, + const VkScreenSurfaceCreateInfoQNX* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkSurfaceKHR* pSurface) +{ + unique_lock_t lock(global_lock); + *pSurface = (VkSurfaceKHR)global_unique_handle++; + return VK_SUCCESS; +} + +static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceScreenPresentationSupportQNX( + VkPhysicalDevice physicalDevice, + uint32_t queueFamilyIndex, + struct _screen_window* window) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} +#endif /* VK_USE_PLATFORM_SCREEN_QNX */ + static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( VkDevice device, diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index 2c75dd6..5fd3ba1 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -82,6 +82,7 @@ static const std::unordered_map instance_extension_map = {"VK_EXT_validation_features", 4}, {"VK_EXT_headless_surface", 1}, {"VK_EXT_directfb_surface", 1}, + {"VK_QNX_screen_surface", 1}, }; // Map of device extension name to version static const std::unordered_map device_extension_map = { @@ -2946,6 +2947,20 @@ static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceDirectFBPresentationSuppo #endif /* VK_USE_PLATFORM_DIRECTFB_EXT */ +#ifdef VK_USE_PLATFORM_SCREEN_QNX + +static VKAPI_ATTR VkResult VKAPI_CALL CreateScreenSurfaceQNX( + VkInstance instance, + const VkScreenSurfaceCreateInfoQNX* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkSurfaceKHR* pSurface); + +static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceScreenPresentationSupportQNX( + VkPhysicalDevice physicalDevice, + uint32_t queueFamilyIndex, + struct _screen_window* window); +#endif /* VK_USE_PLATFORM_SCREEN_QNX */ + static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( VkDevice device, @@ -3588,6 +3603,12 @@ static const std::unordered_map name_to_funcptr_map = { #ifdef VK_USE_PLATFORM_DIRECTFB_EXT {"vkGetPhysicalDeviceDirectFBPresentationSupportEXT", (void*)GetPhysicalDeviceDirectFBPresentationSupportEXT}, #endif +#ifdef VK_USE_PLATFORM_SCREEN_QNX + {"vkCreateScreenSurfaceQNX", (void*)CreateScreenSurfaceQNX}, +#endif +#ifdef VK_USE_PLATFORM_SCREEN_QNX + {"vkGetPhysicalDeviceScreenPresentationSupportQNX", (void*)GetPhysicalDeviceScreenPresentationSupportQNX}, +#endif {"vkCreateAccelerationStructureKHR", (void*)CreateAccelerationStructureKHR}, {"vkDestroyAccelerationStructureKHR", (void*)DestroyAccelerationStructureKHR}, {"vkCmdBuildAccelerationStructuresKHR", (void*)CmdBuildAccelerationStructuresKHR}, diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index e5915d7..b49cf87 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -4275,6 +4275,17 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_SCREEN_SURFACE_CREATE_INFO_QNX; +}; + +template <> struct LvlSTypeMap { + typedef VkScreenSurfaceCreateInfoQNX Type; +}; + +#endif // VK_USE_PLATFORM_SCREEN_QNX // Map type VkAccelerationStructureGeometryTrianglesDataKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR; diff --git a/scripts/known_good.json b/scripts/known_good.json index b5d0594..cfb6c9e 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -6,7 +6,7 @@ "sub_dir" : "Vulkan-Headers", "build_dir" : "Vulkan-Headers/build", "install_dir" : "Vulkan-Headers/build/install", - "commit" : "v1.2.170" + "commit" : "4fe5828a0295a3c29a266e446ac6a6b51d768e48" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.2.170", + "commit" : "v1.2.171", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR",