aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShannon McPherson <shannon@lunarg.com>2019-09-17 13:41:26 -0600
committerShannon McPherson <shannon@lunarg.com>2019-09-17 13:41:26 -0600
commit40cd2166a44647a4283517e31af4589410c654eb (patch)
tree239d6e0ed247a2b15bd25f9f95a9e61a76633b52
parent6cebf14cc64c91f6278ad8d1e331bb9e4a6831f6 (diff)
downloadusermoji-40cd2166a44647a4283517e31af4589410c654eb.tar.xz
build: Update known good for 1.1.123 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: Ic634680499c375fd29ee3d0816fee33aafa3d44f
-rw-r--r--build-android/vulkan-headers_revision_android2
-rw-r--r--icd/generated/mock_icd.cpp2
-rw-r--r--icd/generated/mock_icd.h8
-rw-r--r--icd/generated/vk_typemap_helper.h9
-rw-r--r--scripts/known_good.json4
5 files changed, 20 insertions, 5 deletions
diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android
index 6506f45a..402883a7 100644
--- a/build-android/vulkan-headers_revision_android
+++ b/build-android/vulkan-headers_revision_android
@@ -1 +1 @@
-v1.1.121
+v1.1.123
diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp
index a834ce9f..a32d1195 100644
--- a/icd/generated/mock_icd.cpp
+++ b/icd/generated/mock_icd.cpp
@@ -2890,6 +2890,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdDrawIndexedIndirectCountKHR(
+
static VKAPI_ATTR VkResult VKAPI_CALL GetPipelineExecutablePropertiesKHR(
VkDevice device,
const VkPipelineInfoKHR* pPipelineInfo,
@@ -4141,6 +4142,7 @@ static VKAPI_ATTR void VKAPI_CALL ResetQueryPoolEXT(
+
static VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL GetPhysicalDeviceProcAddr(VkInstance instance, const char *funcName) {
// TODO: This function should only care about physical device functions and return nullptr for other functions
const auto &item = name_to_funcptr_map.find(funcName);
diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h
index 574cb3e2..3863e839 100644
--- a/icd/generated/mock_icd.h
+++ b/icd/generated/mock_icd.h
@@ -61,7 +61,7 @@ static const std::unordered_map<std::string, uint32_t> instance_extension_map =
{"VK_GGP_stream_descriptor_surface", 1},
{"VK_NV_external_memory_capabilities", 1},
{"VK_KHR_get_physical_device_properties2", 2},
- {"VK_EXT_validation_flags", 1},
+ {"VK_EXT_validation_flags", 2},
{"VK_NN_vi_surface", 1},
{"VK_KHR_device_group_creation", 1},
{"VK_KHR_external_memory_capabilities", 1},
@@ -80,7 +80,7 @@ static const std::unordered_map<std::string, uint32_t> instance_extension_map =
{"VK_EXT_metal_surface", 1},
{"VK_KHR_surface_protected_capabilities", 1},
{"VK_EXT_validation_features", 2},
- {"VK_EXT_headless_surface", 0},
+ {"VK_EXT_headless_surface", 1},
};
// Map of device extension name to version
static const std::unordered_map<std::string, uint32_t> device_extension_map = {
@@ -185,6 +185,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
{"VK_KHR_draw_indirect_count", 1},
{"VK_EXT_filter_cubic", 2},
{"VK_EXT_global_priority", 2},
+ {"VK_KHR_shader_subgroup_extended_types", 1},
{"VK_KHR_8bit_storage", 1},
{"VK_EXT_external_memory_host", 1},
{"VK_AMD_buffer_marker", 1},
@@ -236,6 +237,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
{"VK_KHR_pipeline_executable_properties", 1},
{"VK_EXT_shader_demote_to_helper_invocation", 1},
{"VK_EXT_texel_buffer_alignment", 1},
+ {"VK_GOOGLE_user_type", 1},
};
@@ -1720,6 +1722,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdDrawIndexedIndirectCountKHR(
+
static VKAPI_ATTR VkResult VKAPI_CALL GetPipelineExecutablePropertiesKHR(
VkDevice device,
const VkPipelineInfoKHR* pPipelineInfo,
@@ -2535,6 +2538,7 @@ static VKAPI_ATTR void VKAPI_CALL ResetQueryPoolEXT(
+
// Map of all APIs to be intercepted by this layer
static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
{"vkCreateInstance", (void*)CreateInstance},
diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h
index 51b20822..20bc5344 100644
--- a/icd/generated/vk_typemap_helper.h
+++ b/icd/generated/vk_typemap_helper.h
@@ -1612,6 +1612,15 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO_K
typedef VkImageFormatListCreateInfoKHR Type;
};
+// Map type VkPhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES_KHR
+template <> struct LvlTypeMap<VkPhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES_KHR;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES_KHR> {
+ typedef VkPhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR Type;
+};
+
// Map type VkPhysicalDevice8BitStorageFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR
template <> struct LvlTypeMap<VkPhysicalDevice8BitStorageFeaturesKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR;
diff --git a/scripts/known_good.json b/scripts/known_good.json
index f13c02ff..d6d46c42 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.1.121"
+ "commit" : "v1.1.123"
},
{
"name" : "MoltenVK",
@@ -41,7 +41,7 @@
"sub_dir" : "Vulkan-Loader",
"build_dir" : "Vulkan-Loader/build",
"install_dir" : "Vulkan-Loader/build/install",
- "commit" : "v1.1.121",
+ "commit" : "v1.1.123",
"deps" : [
{
"var_name" : "VULKAN_HEADERS_INSTALL_DIR",