From ae0f0ead3a56a241355b8139f40210bca3308071 Mon Sep 17 00:00:00 2001 From: Shannon McPherson Date: Fri, 10 Apr 2020 16:14:29 -0600 Subject: build: Update known-good files for 1.2.137 header Changes: - Updated known-good files - Generated new source files - Removed `VULKAN_HPP_NO_SMART_HANDLE` definition for `cube.cpp` Change-Id: Icb0152455f2c0b21a29d70462d05b958c53be861 --- build-android/vulkan-headers_revision_android | 2 +- cube/cube.cpp | 1 - icd/generated/mock_icd.cpp | 10 ++++++++++ icd/generated/mock_icd.h | 14 +++++++++++--- icd/generated/vk_typemap_helper.h | 15 ++++++++++++--- scripts/known_good.json | 4 ++-- vulkaninfo/generated/vulkaninfo.hpp | 2 +- 7 files changed, 37 insertions(+), 11 deletions(-) diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index 06a90378..25a13d13 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.2.135 \ No newline at end of file +v1.2.137 diff --git a/cube/cube.cpp b/cube/cube.cpp index bc10ac7f..dda631fa 100644 --- a/cube/cube.cpp +++ b/cube/cube.cpp @@ -34,7 +34,6 @@ #include #include -#define VULKAN_HPP_NO_SMART_HANDLE #define VULKAN_HPP_NO_EXCEPTIONS #define VULKAN_HPP_TYPESAFE_CONVERSION #include diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index 1f3167c3..3a4f0d67 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -3340,6 +3340,15 @@ static VKAPI_ATTR uint32_t VKAPI_CALL GetImageViewHandleNVX( return VK_SUCCESS; } +static VKAPI_ATTR VkResult VKAPI_CALL GetImageViewAddressNVX( + VkDevice device, + VkImageView imageView, + VkImageViewAddressPropertiesNVX* pProperties) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + static VKAPI_ATTR void VKAPI_CALL CmdDrawIndirectCountAMD( VkCommandBuffer commandBuffer, @@ -4432,6 +4441,7 @@ static VKAPI_ATTR void VKAPI_CALL DestroyIndirectCommandsLayoutNV( + #ifdef VK_ENABLE_BETA_EXTENSIONS static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index c68693d5..d923fa54 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -75,7 +75,7 @@ static const std::unordered_map instance_extension_map = {"VK_KHR_get_display_properties2", 1}, {"VK_MVK_ios_surface", 2}, {"VK_MVK_macos_surface", 2}, - {"VK_EXT_debug_utils", 1}, + {"VK_EXT_debug_utils", 2}, {"VK_FUCHSIA_imagepipe_surface", 1}, {"VK_EXT_metal_surface", 1}, {"VK_KHR_surface_protected_capabilities", 1}, @@ -97,7 +97,7 @@ static const std::unordered_map device_extension_map = { {"VK_AMD_gcn_shader", 1}, {"VK_NV_dedicated_allocation", 1}, {"VK_EXT_transform_feedback", 1}, - {"VK_NVX_image_view_handle", 1}, + {"VK_NVX_image_view_handle", 2}, {"VK_AMD_draw_indirect_count", 2}, {"VK_AMD_negative_viewport_height", 1}, {"VK_AMD_gpu_shader_half_float", 2}, @@ -250,8 +250,9 @@ static const std::unordered_map device_extension_map = { {"VK_GOOGLE_user_type", 1}, {"VK_KHR_pipeline_library", 1}, {"VK_KHR_shader_non_semantic_info", 1}, - {"VK_EXT_pipeline_creation_cache_control", 2}, + {"VK_EXT_pipeline_creation_cache_control", 3}, {"VK_NV_device_diagnostics_config", 1}, + {"VK_QCOM_render_pass_store_ops", 2}, }; @@ -2006,6 +2007,11 @@ static VKAPI_ATTR uint32_t VKAPI_CALL GetImageViewHandleNVX( VkDevice device, const VkImageViewHandleInfoNVX* pInfo); +static VKAPI_ATTR VkResult VKAPI_CALL GetImageViewAddressNVX( + VkDevice device, + VkImageView imageView, + VkImageViewAddressPropertiesNVX* pProperties); + static VKAPI_ATTR void VKAPI_CALL CmdDrawIndirectCountAMD( VkCommandBuffer commandBuffer, @@ -2721,6 +2727,7 @@ static VKAPI_ATTR void VKAPI_CALL DestroyIndirectCommandsLayoutNV( + #ifdef VK_ENABLE_BETA_EXTENSIONS static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( @@ -3167,6 +3174,7 @@ static const std::unordered_map name_to_funcptr_map = { {"vkCmdEndQueryIndexedEXT", (void*)CmdEndQueryIndexedEXT}, {"vkCmdDrawIndirectByteCountEXT", (void*)CmdDrawIndirectByteCountEXT}, {"vkGetImageViewHandleNVX", (void*)GetImageViewHandleNVX}, + {"vkGetImageViewAddressNVX", (void*)GetImageViewAddressNVX}, {"vkCmdDrawIndirectCountAMD", (void*)CmdDrawIndirectCountAMD}, {"vkCmdDrawIndexedIndirectCountAMD", (void*)CmdDrawIndexedIndirectCountAMD}, {"vkGetShaderInfoAMD", (void*)GetShaderInfoAMD}, diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index bb419a4d..93708e65 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -2210,6 +2210,15 @@ template <> struct LvlSTypeMap { typedef VkImageViewHandleInfoNVX Type; }; +// Map type VkImageViewAddressPropertiesNVX to id VK_STRUCTURE_TYPE_IMAGE_VIEW_ADDRESS_PROPERTIES_NVX +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMAGE_VIEW_ADDRESS_PROPERTIES_NVX; +}; + +template <> struct LvlSTypeMap { + typedef VkImageViewAddressPropertiesNVX Type; +}; + // Map type VkTextureLODGatherFormatPropertiesAMD to id VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD; @@ -3237,12 +3246,12 @@ template <> struct LvlSTypeMap struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO_INTEL; + static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_QUERY_CREATE_INFO_INTEL; }; -template <> struct LvlSTypeMap { +template <> struct LvlSTypeMap { typedef VkQueryPoolPerformanceQueryCreateInfoINTEL Type; }; diff --git a/scripts/known_good.json b/scripts/known_good.json index 57ebe99d..13b1f7af 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -17,7 +17,7 @@ "sub_dir" : "Vulkan-Headers", "build_dir" : "Vulkan-Headers/build", "install_dir" : "Vulkan-Headers/build/install", - "commit" : "v1.2.135" + "commit" : "v1.2.137" }, { "name" : "MoltenVK", @@ -41,7 +41,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.2.135", + "commit" : "v1.2.137", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index 97174d60..a3684424 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -88,7 +88,7 @@ static const char *VkResultString(VkResult value) { case (1000268001): return "THREAD_DONE_KHR"; case (1000268002): return "OPERATION_DEFERRED_KHR"; case (1000268003): return "OPERATION_NOT_DEFERRED_KHR"; - case (1000297000): return "ERROR_PIPELINE_COMPILE_REQUIRED_EXT"; + case (1000297000): return "PIPELINE_COMPILE_REQUIRED_EXT"; default: return "UNKNOWN_VkResult"; } } -- cgit v1.2.3