From ef9db7a8ec52f6c56158d83f5d57ef388c1abec1 Mon Sep 17 00:00:00 2001
From: Mike Schuchardt <mikes@lunarg.com>
Date: Thu, 2 Jun 2022 12:53:27 -0700
Subject: build: Update to header 1.3.216

- Update known-good
- Generate source
---
 build-android/vulkan-headers_revision_android |  2 +-
 icd/generated/mock_icd.h                      |  2 +-
 icd/generated/vk_typemap_helper.h             | 20 ++++++++++----------
 scripts/generate_vulkan_wrapper.py            |  2 +-
 scripts/known_good.json                       |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android
index c5ea0fd1..ef4a6035 100644
--- a/build-android/vulkan-headers_revision_android
+++ b/build-android/vulkan-headers_revision_android
@@ -1 +1 @@
-v1.3.215
+v1.3.216
diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h
index 34471378..b8ce2025 100644
--- a/icd/generated/mock_icd.h
+++ b/icd/generated/mock_icd.h
@@ -334,7 +334,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
     {"VK_QCOM_fragment_density_map_offset", 1},
     {"VK_NV_linear_color_attachment", 1},
     {"VK_EXT_image_compression_control_swapchain", 1},
-    {"VK_EXT_subpass_merge_feedback", 1},
+    {"VK_EXT_subpass_merge_feedback", 2},
 };
 
 
diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h
index a200cb87..0905d0ea 100644
--- a/icd/generated/vk_typemap_helper.h
+++ b/icd/generated/vk_typemap_helper.h
@@ -5892,22 +5892,22 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_RENDER_PASS_CREATION_CONTROL_EX
     typedef VkRenderPassCreationControlEXT Type;
 };
 
-// Map type VkRenderPassCreationFeedbackInfoEXT to id VK_STRUCTURE_TYPE_RENDER_PASS_CREATION_FEEDBACK_INFO_EXT
-template <> struct LvlTypeMap<VkRenderPassCreationFeedbackInfoEXT> {
-    static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATION_FEEDBACK_INFO_EXT;
+// Map type VkRenderPassCreationFeedbackCreateInfoEXT to id VK_STRUCTURE_TYPE_RENDER_PASS_CREATION_FEEDBACK_CREATE_INFO_EXT
+template <> struct LvlTypeMap<VkRenderPassCreationFeedbackCreateInfoEXT> {
+    static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATION_FEEDBACK_CREATE_INFO_EXT;
 };
 
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_RENDER_PASS_CREATION_FEEDBACK_INFO_EXT> {
-    typedef VkRenderPassCreationFeedbackInfoEXT Type;
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_RENDER_PASS_CREATION_FEEDBACK_CREATE_INFO_EXT> {
+    typedef VkRenderPassCreationFeedbackCreateInfoEXT Type;
 };
 
-// Map type VkRenderPassSubpassFeedbackInfoEXT to id VK_STRUCTURE_TYPE_RENDER_PASS_SUBPASS_FEEDBACK_INFO_EXT
-template <> struct LvlTypeMap<VkRenderPassSubpassFeedbackInfoEXT> {
-    static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDER_PASS_SUBPASS_FEEDBACK_INFO_EXT;
+// Map type VkRenderPassSubpassFeedbackCreateInfoEXT to id VK_STRUCTURE_TYPE_RENDER_PASS_SUBPASS_FEEDBACK_CREATE_INFO_EXT
+template <> struct LvlTypeMap<VkRenderPassSubpassFeedbackCreateInfoEXT> {
+    static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDER_PASS_SUBPASS_FEEDBACK_CREATE_INFO_EXT;
 };
 
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_RENDER_PASS_SUBPASS_FEEDBACK_INFO_EXT> {
-    typedef VkRenderPassSubpassFeedbackInfoEXT Type;
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_RENDER_PASS_SUBPASS_FEEDBACK_CREATE_INFO_EXT> {
+    typedef VkRenderPassSubpassFeedbackCreateInfoEXT Type;
 };
 
 // Map type VkAccelerationStructureGeometryTrianglesDataKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR
diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py
index c38d052f..d9e1f9c8 100755
--- a/scripts/generate_vulkan_wrapper.py
+++ b/scripts/generate_vulkan_wrapper.py
@@ -1315,7 +1315,7 @@ VK_GOOGLE_surfaceless_query = Extension(name='VK_GOOGLE_surfaceless_query', vers
 VK_EXT_image_compression_control_swapchain = Extension(name='VK_EXT_image_compression_control_swapchain', version=1, guard=None, commands=[
 ])
 
-VK_EXT_subpass_merge_feedback = Extension(name='VK_EXT_subpass_merge_feedback', version=1, guard=None, commands=[
+VK_EXT_subpass_merge_feedback = Extension(name='VK_EXT_subpass_merge_feedback', version=2, guard=None, commands=[
 ])
 
 VK_KHR_acceleration_structure = Extension(name='VK_KHR_acceleration_structure', version=13, guard=None, commands=[
diff --git a/scripts/known_good.json b/scripts/known_good.json
index 1d540d8b..ade9f8c6 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.215"
+      "commit" : "v1.3.216"
     },
     {
       "name" : "MoltenVK",
@@ -30,7 +30,7 @@
       "sub_dir" : "Vulkan-Loader",
       "build_dir" : "Vulkan-Loader/build",
       "install_dir" : "Vulkan-Loader/build/install",
-      "commit" : "v1.3.215",
+      "commit" : "v1.3.216",
       "deps" : [
         {
           "var_name" : "VULKAN_HEADERS_INSTALL_DIR",
-- 
cgit v1.2.3