diff options
| author | Shannon McPherson <shannon@lunarg.com> | 2020-12-22 16:27:35 -0700 |
|---|---|---|
| committer | Shannon McPherson <shannon@lunarg.com> | 2020-12-28 14:13:43 -0700 |
| commit | 4cc0932495ec1eb132c309473b8efc0b6b0d75b3 (patch) | |
| tree | 1c58ff22f1b2250ea33ad1284d5041f25d996632 | |
| parent | 1f550ddec2f3519f3ee7fd9cb1941b5642796ae2 (diff) | |
| download | usermoji-4cc0932495ec1eb132c309473b8efc0b6b0d75b3.tar.xz | |
build: Update known-good files for 1.2.165 header
Changes:
- Updated `known_good.json`
- Generated new source files
Change-Id: I83402ae9bf0495e1105d124feedfa2ced92a9647
| -rw-r--r-- | build-android/vulkan-headers_revision_android | 2 | ||||
| -rw-r--r-- | icd/generated/mock_icd.cpp | 21 | ||||
| -rw-r--r-- | icd/generated/mock_icd.h | 21 | ||||
| -rw-r--r-- | icd/generated/vk_typemap_helper.h | 18 | ||||
| -rw-r--r-- | scripts/known_good.json | 4 |
5 files changed, 63 insertions, 3 deletions
diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index 948ac7e7..cf815227 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.2.162 +v1.2.165 diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index ed6491de..9c1bbd72 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -4689,6 +4689,26 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetFragmentShadingRateEnumNV( +#ifdef VK_USE_PLATFORM_WIN32_KHR + +static VKAPI_ATTR VkResult VKAPI_CALL AcquireWinrtDisplayNV( + VkPhysicalDevice physicalDevice, + VkDisplayKHR display) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + +static VKAPI_ATTR VkResult VKAPI_CALL GetWinrtDisplayNV( + VkPhysicalDevice physicalDevice, + uint32_t deviceRelativeId, + VkDisplayKHR* pDisplay) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} +#endif /* VK_USE_PLATFORM_WIN32_KHR */ + #ifdef VK_USE_PLATFORM_DIRECTFB_EXT static VKAPI_ATTR VkResult VKAPI_CALL CreateDirectFBSurfaceEXT( @@ -4713,6 +4733,7 @@ static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceDirectFBPresentationSuppo #endif /* VK_USE_PLATFORM_DIRECTFB_EXT */ + static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( VkDevice device, const VkAccelerationStructureCreateInfoKHR* pCreateInfo, diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index 8355d263..f6c306ef 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -272,6 +272,8 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = { {"VK_EXT_image_robustness", 1}, {"VK_KHR_copy_commands2", 1}, {"VK_EXT_4444_formats", 1}, + {"VK_NV_acquire_winrt_display", 1}, + {"VK_VALVE_mutable_descriptor_type", 1}, }; @@ -2867,6 +2869,18 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetFragmentShadingRateEnumNV( +#ifdef VK_USE_PLATFORM_WIN32_KHR + +static VKAPI_ATTR VkResult VKAPI_CALL AcquireWinrtDisplayNV( + VkPhysicalDevice physicalDevice, + VkDisplayKHR display); + +static VKAPI_ATTR VkResult VKAPI_CALL GetWinrtDisplayNV( + VkPhysicalDevice physicalDevice, + uint32_t deviceRelativeId, + VkDisplayKHR* pDisplay); +#endif /* VK_USE_PLATFORM_WIN32_KHR */ + #ifdef VK_USE_PLATFORM_DIRECTFB_EXT static VKAPI_ATTR VkResult VKAPI_CALL CreateDirectFBSurfaceEXT( @@ -2882,6 +2896,7 @@ static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceDirectFBPresentationSuppo #endif /* VK_USE_PLATFORM_DIRECTFB_EXT */ + static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( VkDevice device, const VkAccelerationStructureCreateInfoKHR* pCreateInfo, @@ -3503,6 +3518,12 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = { {"vkSetPrivateDataEXT", (void*)SetPrivateDataEXT}, {"vkGetPrivateDataEXT", (void*)GetPrivateDataEXT}, {"vkCmdSetFragmentShadingRateEnumNV", (void*)CmdSetFragmentShadingRateEnumNV}, +#ifdef VK_USE_PLATFORM_WIN32_KHR + {"vkAcquireWinrtDisplayNV", (void*)AcquireWinrtDisplayNV}, +#endif +#ifdef VK_USE_PLATFORM_WIN32_KHR + {"vkGetWinrtDisplayNV", (void*)GetWinrtDisplayNV}, +#endif #ifdef VK_USE_PLATFORM_DIRECTFB_EXT {"vkCreateDirectFBSurfaceEXT", (void*)CreateDirectFBSurfaceEXT}, #endif diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 38b536a5..8d6e86d1 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -4149,6 +4149,24 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_DIRECTFB_SURFACE_CREATE_INFO_EX }; #endif // VK_USE_PLATFORM_DIRECTFB_EXT +// Map type VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE +template <> struct LvlTypeMap<VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE> { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE; +}; + +template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE> { + typedef VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE Type; +}; + +// Map type VkMutableDescriptorTypeCreateInfoVALVE to id VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE +template <> struct LvlTypeMap<VkMutableDescriptorTypeCreateInfoVALVE> { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE; +}; + +template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE> { + typedef VkMutableDescriptorTypeCreateInfoVALVE Type; +}; + // Map type VkAccelerationStructureGeometryTrianglesDataKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR template <> struct LvlTypeMap<VkAccelerationStructureGeometryTrianglesDataKHR> { 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 0ea8ce2b..eccb9e61 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.162" + "commit" : "v1.2.165" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.2.162", + "commit" : "v1.2.165", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", |
