From 99500cee1e2d343bd6905d6f0b63645fd161256a Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Tue, 15 Mar 2022 12:07:50 -0700 Subject: [PATCH] build: Update to header 1.3.208 - Update known-good - Generate source --- build-android/vulkan-headers_revision_android | 2 +- icd/generated/mock_icd.cpp | 1 + icd/generated/mock_icd.h | 4 +++- scripts/generate_vulkan_wrapper.py | 6 +++++- scripts/known_good.json | 4 ++-- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index 77b9a44..cdb1b1f 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.3.207 +v1.3.208 diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index 3d9ccae..3372fcc 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -3895,6 +3895,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdResolveImage2KHR( + static VKAPI_ATTR void VKAPI_CALL GetDeviceBufferMemoryRequirementsKHR( VkDevice device, const VkDeviceBufferMemoryRequirements* pInfo, diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index a57bb56..aab85c9 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -84,6 +84,7 @@ static const std::unordered_map instance_extension_map = {"VK_EXT_acquire_drm_display", 1}, {"VK_EXT_directfb_surface", 1}, {"VK_QNX_screen_surface", 1}, + {"VK_KHR_portability_enumeration", 1}, {"VK_GOOGLE_surfaceless_query", 1}, }; // Map of device extension name to version @@ -166,7 +167,7 @@ static const std::unordered_map device_extension_map = { {"VK_EXT_external_memory_dma_buf", 1}, {"VK_EXT_queue_family_foreign", 1}, {"VK_KHR_dedicated_allocation", 3}, - {"VK_ANDROID_external_memory_android_hardware_buffer", 4}, + {"VK_ANDROID_external_memory_android_hardware_buffer", 5}, {"VK_EXT_sampler_filter_minmax", 2}, {"VK_KHR_storage_buffer_storage_class", 1}, {"VK_AMD_gpu_shader_int16", 2}, @@ -2342,6 +2343,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdResolveImage2KHR( + static VKAPI_ATTR void VKAPI_CALL GetDeviceBufferMemoryRequirementsKHR( VkDevice device, const VkDeviceBufferMemoryRequirements* pInfo, diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py index 0580690..5a31bce 100755 --- a/scripts/generate_vulkan_wrapper.py +++ b/scripts/generate_vulkan_wrapper.py @@ -651,6 +651,9 @@ VK_KHR_copy_commands2 = Extension(name='VK_KHR_copy_commands2', version=1, guard VK_KHR_format_feature_flags2 = Extension(name='VK_KHR_format_feature_flags2', version=1, guard=None, commands=[ ]) +VK_KHR_portability_enumeration = Extension(name='VK_KHR_portability_enumeration', version=1, guard=None, commands=[ +]) + VK_KHR_maintenance4 = Extension(name='VK_KHR_maintenance4', version=2, guard=None, commands=[ Command(name='vkGetDeviceBufferMemoryRequirementsKHR', dispatch='VkDevice'), Command(name='vkGetDeviceImageMemoryRequirementsKHR', dispatch='VkDevice'), @@ -1317,7 +1320,7 @@ VK_KHR_android_surface = Extension(name='VK_KHR_android_surface', version=6, gua Command(name='vkCreateAndroidSurfaceKHR', dispatch='VkInstance'), ]) -VK_ANDROID_external_memory_android_hardware_buffer = Extension(name='VK_ANDROID_external_memory_android_hardware_buffer', version=4, guard='VK_USE_PLATFORM_ANDROID_KHR', commands=[ +VK_ANDROID_external_memory_android_hardware_buffer = Extension(name='VK_ANDROID_external_memory_android_hardware_buffer', version=5, guard='VK_USE_PLATFORM_ANDROID_KHR', commands=[ Command(name='vkGetAndroidHardwareBufferPropertiesANDROID', dispatch='VkDevice'), Command(name='vkGetMemoryAndroidHardwareBufferANDROID', dispatch='VkDevice'), ]) @@ -1551,6 +1554,7 @@ extensions = [ VK_KHR_workgroup_memory_explicit_layout, VK_KHR_copy_commands2, VK_KHR_format_feature_flags2, + VK_KHR_portability_enumeration, VK_KHR_maintenance4, VK_EXT_debug_report, VK_NV_glsl_shader, diff --git a/scripts/known_good.json b/scripts/known_good.json index a0871fd..f8f4f9c 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.3.207" + "commit" : "v1.3.208" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.3.207", + "commit" : "v1.3.208", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", -- 2.7.4