build: Update known good for 1.1.121 vulkan header

Changes:
- Updated known good files
- Generated new files using `generate_source.py`

Updated:
- `build-android/vulkan-headers_revision_android`
- `icd/generated/mock_icd.cpp`
- `icd/generated/mock_icd.h`
- `icd/generated/vk_typemap_helper.h`
- `scripts/known_good.json`

Change-Id: Id5022fa1d82ae090cd5d50e7937274e93587163e

5 files changed, 30 insertions, 18 deletions

diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android
index 2fbd54a1..6506f45a 100644
--- a/build-android/vulkan-headers_revision_android
+++ b/build-android/vulkan-headers_revision_android
@@ -1 +1 @@
-9eab96f40634c81ed53d54d2c9df126a445dfd56
+v1.1.121
diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp
index e4c94349..93eb1d8c 100644
--- a/icd/generated/mock_icd.cpp
+++ b/icd/generated/mock_icd.cpp
@@ -4034,6 +4034,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateMetalSurfaceEXT(
 
 
 
+
 static VKAPI_ATTR VkDeviceAddress VKAPI_CALL GetBufferDeviceAddressEXT(
     VkDevice                                    device,
     const VkBufferDeviceAddressInfoEXT*         pInfo)
diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h
index d15b8407..574cb3e2 100644
--- a/icd/generated/mock_icd.h
+++ b/icd/generated/mock_icd.h
@@ -51,7 +51,7 @@ static void DestroyDispObjHandle(void* handle) {
 // Map of instance extension name to version
 static const std::unordered_map<std::string, uint32_t> instance_extension_map = {
     {"VK_KHR_surface", 25},
-    {"VK_KHR_display", 21},
+    {"VK_KHR_display", 23},
     {"VK_KHR_xlib_surface", 6},
     {"VK_KHR_xcb_surface", 6},
     {"VK_KHR_wayland_surface", 6},
@@ -60,7 +60,7 @@ static const std::unordered_map<std::string, uint32_t> instance_extension_map =
     {"VK_EXT_debug_report", 9},
     {"VK_GGP_stream_descriptor_surface", 1},
     {"VK_NV_external_memory_capabilities", 1},
-    {"VK_KHR_get_physical_device_properties2", 1},
+    {"VK_KHR_get_physical_device_properties2", 2},
     {"VK_EXT_validation_flags", 1},
     {"VK_NN_vi_surface", 1},
     {"VK_KHR_device_group_creation", 1},
@@ -85,10 +85,10 @@ static const std::unordered_map<std::string, uint32_t> instance_extension_map =
 // Map of device extension name to version
 static const std::unordered_map<std::string, uint32_t> device_extension_map = {
     {"VK_KHR_swapchain", 70},
-    {"VK_KHR_display_swapchain", 9},
+    {"VK_KHR_display_swapchain", 10},
     {"VK_NV_glsl_shader", 1},
     {"VK_EXT_depth_range_unrestricted", 1},
-    {"VK_KHR_sampler_mirror_clamp_to_edge", 1},
+    {"VK_KHR_sampler_mirror_clamp_to_edge", 3},
     {"VK_IMG_filter_cubic", 1},
     {"VK_AMD_rasterization_order", 1},
     {"VK_AMD_shader_trinary_minmax", 1},
@@ -98,7 +98,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
     {"VK_NV_dedicated_allocation", 1},
     {"VK_EXT_transform_feedback", 1},
     {"VK_NVX_image_view_handle", 1},
-    {"VK_AMD_draw_indirect_count", 1},
+    {"VK_AMD_draw_indirect_count", 2},
     {"VK_AMD_negative_viewport_height", 1},
     {"VK_AMD_gpu_shader_half_float", 2},
     {"VK_AMD_shader_ballot", 1},
@@ -110,8 +110,8 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
     {"VK_IMG_format_pvrtc", 1},
     {"VK_NV_external_memory", 1},
     {"VK_NV_external_memory_win32", 1},
-    {"VK_NV_win32_keyed_mutex", 1},
-    {"VK_KHR_device_group", 3},
+    {"VK_NV_win32_keyed_mutex", 2},
+    {"VK_KHR_device_group", 4},
     {"VK_KHR_shader_draw_parameters", 1},
     {"VK_EXT_shader_subgroup_ballot", 1},
     {"VK_EXT_shader_subgroup_vote", 1},
@@ -126,7 +126,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
     {"VK_KHR_external_semaphore_win32", 1},
     {"VK_KHR_external_semaphore_fd", 1},
     {"VK_KHR_push_descriptor", 2},
-    {"VK_EXT_conditional_rendering", 1},
+    {"VK_EXT_conditional_rendering", 2},
     {"VK_KHR_shader_float16_int8", 1},
     {"VK_KHR_16bit_storage", 1},
     {"VK_KHR_incremental_present", 1},
@@ -143,7 +143,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
     {"VK_EXT_discard_rectangles", 1},
     {"VK_EXT_conservative_rasterization", 1},
     {"VK_EXT_depth_clip_enable", 1},
-    {"VK_EXT_hdr_metadata", 1},
+    {"VK_EXT_hdr_metadata", 2},
     {"VK_KHR_imageless_framebuffer", 1},
     {"VK_KHR_create_renderpass2", 1},
     {"VK_KHR_shared_presentable_image", 1},
@@ -156,7 +156,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
     {"VK_EXT_queue_family_foreign", 1},
     {"VK_KHR_dedicated_allocation", 3},
     {"VK_ANDROID_external_memory_android_hardware_buffer", 3},
-    {"VK_EXT_sampler_filter_minmax", 1},
+    {"VK_EXT_sampler_filter_minmax", 2},
     {"VK_KHR_storage_buffer_storage_class", 1},
     {"VK_AMD_gpu_shader_int16", 2},
     {"VK_AMD_mixed_attachment_samples", 1},
@@ -173,14 +173,14 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
     {"VK_NV_fill_rectangle", 1},
     {"VK_NV_shader_sm_builtins", 1},
     {"VK_EXT_post_depth_coverage", 1},
-    {"VK_KHR_sampler_ycbcr_conversion", 1},
+    {"VK_KHR_sampler_ycbcr_conversion", 14},
     {"VK_KHR_bind_memory2", 1},
     {"VK_EXT_image_drm_format_modifier", 1},
     {"VK_EXT_descriptor_indexing", 2},
     {"VK_EXT_shader_viewport_index_layer", 1},
     {"VK_NV_shading_rate_image", 3},
     {"VK_NV_ray_tracing", 3},
-    {"VK_NV_representative_fragment_test", 1},
+    {"VK_NV_representative_fragment_test", 2},
     {"VK_KHR_maintenance3", 1},
     {"VK_KHR_draw_indirect_count", 1},
     {"VK_EXT_filter_cubic", 2},
@@ -191,7 +191,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
     {"VK_KHR_shader_atomic_int64", 1},
     {"VK_AMD_pipeline_compiler_control", 1},
     {"VK_EXT_calibrated_timestamps", 1},
-    {"VK_AMD_shader_core_properties", 1},
+    {"VK_AMD_shader_core_properties", 2},
     {"VK_AMD_memory_overallocation_behavior", 1},
     {"VK_EXT_vertex_attribute_divisor", 3},
     {"VK_GGP_frame_token", 1},
@@ -204,7 +204,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
     {"VK_NV_compute_shader_derivatives", 1},
     {"VK_NV_mesh_shader", 1},
     {"VK_NV_fragment_shader_barycentric", 1},
-    {"VK_NV_shader_image_footprint", 1},
+    {"VK_NV_shader_image_footprint", 2},
     {"VK_NV_scissor_exclusive", 1},
     {"VK_NV_device_diagnostic_checkpoints", 2},
     {"VK_INTEL_shader_integer_functions2", 1},
@@ -218,6 +218,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
     {"VK_GOOGLE_decorate_string", 1},
     {"VK_EXT_subgroup_size_control", 2},
     {"VK_AMD_shader_core_properties2", 1},
+    {"VK_AMD_device_coherent_memory", 1},
     {"VK_EXT_memory_budget", 1},
     {"VK_EXT_memory_priority", 1},
     {"VK_NV_dedicated_allocation_image_aliasing", 1},
@@ -228,7 +229,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
     {"VK_EXT_fragment_shader_interlock", 1},
     {"VK_EXT_ycbcr_image_arrays", 1},
     {"VK_KHR_uniform_buffer_standard_layout", 1},
-    {"VK_EXT_full_screen_exclusive", 3},
+    {"VK_EXT_full_screen_exclusive", 4},
     {"VK_EXT_line_rasterization", 1},
     {"VK_EXT_host_query_reset", 1},
     {"VK_EXT_index_type_uint8", 1},
@@ -2468,6 +2469,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateMetalSurfaceEXT(
 
 
 
+
 static VKAPI_ATTR VkDeviceAddress VKAPI_CALL GetBufferDeviceAddressEXT(
     VkDevice                                    device,
     const VkBufferDeviceAddressInfoEXT*         pInfo);
diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h
index eff0a0b0..51b20822 100644
--- a/icd/generated/vk_typemap_helper.h
+++ b/icd/generated/vk_typemap_helper.h
@@ -3165,6 +3165,15 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PRO
     typedef VkPhysicalDeviceShaderCoreProperties2AMD Type;
 };
 
+// Map type VkPhysicalDeviceCoherentMemoryFeaturesAMD to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD
+template <> struct LvlTypeMap<VkPhysicalDeviceCoherentMemoryFeaturesAMD> {
+    static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD> {
+    typedef VkPhysicalDeviceCoherentMemoryFeaturesAMD Type;
+};
+
 // Map type VkPhysicalDeviceMemoryBudgetPropertiesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT
 template <> struct LvlTypeMap<VkPhysicalDeviceMemoryBudgetPropertiesEXT> {
     static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT;
diff --git a/scripts/known_good.json b/scripts/known_good.json
index 45dfc1eb..7adfa728 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" : "9eab96f40634c81ed53d54d2c9df126a445dfd56"
+      "commit" : "v1.1.121"
     },
     {
       "name" : "MoltenVK",
@@ -41,7 +41,7 @@
       "sub_dir" : "Vulkan-Loader",
       "build_dir" : "Vulkan-Loader/build",
       "install_dir" : "Vulkan-Loader/build/install",
-      "commit" : "v1.1.120",
+      "commit" : "v1.1.121",
       "deps" : [
         {
           "var_name" : "VULKAN_HEADERS_INSTALL_DIR",