aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Schuchardt <mikes@lunarg.com>2022-04-05 10:29:34 -0700
committerMike Schuchardt <mikes@lunarg.com>2022-04-05 11:19:06 -0700
commitfc0b3f063ff616aca3b7b6231152bb13e36eff42 (patch)
treefcbe46465e8e9f6b130dd89f1d41bd1f5f7a1a0a
parent0265f2e00b5b35b2629ab80c9a9b3bd0f3098a94 (diff)
downloadusermoji-fc0b3f063ff616aca3b7b6231152bb13e36eff42.tar.xz
build: Update to header 1.3.211
- Update known-good - Generate source
-rw-r--r--build-android/vulkan-headers_revision_android2
-rw-r--r--icd/generated/mock_icd.cpp1
-rw-r--r--icd/generated/mock_icd.h12
-rw-r--r--icd/generated/vk_typemap_helper.h9
-rwxr-xr-xscripts/generate_vulkan_wrapper.py14
-rw-r--r--scripts/known_good.json4
-rw-r--r--vulkaninfo/generated/vulkaninfo.hpp15
7 files changed, 44 insertions, 13 deletions
diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android
index 6a1feeca..d19f8882 100644
--- a/build-android/vulkan-headers_revision_android
+++ b/build-android/vulkan-headers_revision_android
@@ -1 +1 @@
-v1.3.210
+v1.3.211
diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp
index 8b8ccd21..b3518149 100644
--- a/icd/generated/mock_icd.cpp
+++ b/icd/generated/mock_icd.cpp
@@ -5669,6 +5669,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdDrawMultiIndexedEXT(
+
static VKAPI_ATTR void VKAPI_CALL SetDeviceMemoryPriorityEXT(
VkDevice device,
VkDeviceMemory memory,
diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h
index 696cc8d5..0b22460b 100644
--- a/icd/generated/mock_icd.h
+++ b/icd/generated/mock_icd.h
@@ -100,7 +100,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
{"VK_AMD_shader_explicit_vertex_parameter", 1},
{"VK_EXT_debug_marker", 4},
{"VK_KHR_video_queue", 3},
- {"VK_KHR_video_decode_queue", 3},
+ {"VK_KHR_video_decode_queue", 4},
{"VK_AMD_gcn_shader", 1},
{"VK_NV_dedicated_allocation", 1},
{"VK_EXT_transform_feedback", 1},
@@ -111,8 +111,8 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
{"VK_AMD_gpu_shader_half_float", 2},
{"VK_AMD_shader_ballot", 1},
{"VK_EXT_video_encode_h264", 6},
- {"VK_EXT_video_encode_h265", 6},
- {"VK_EXT_video_decode_h264", 4},
+ {"VK_EXT_video_encode_h265", 7},
+ {"VK_EXT_video_decode_h264", 5},
{"VK_AMD_texture_gather_bias_lod", 1},
{"VK_AMD_shader_info", 1},
{"VK_KHR_dynamic_rendering", 1},
@@ -210,7 +210,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
{"VK_AMD_pipeline_compiler_control", 1},
{"VK_EXT_calibrated_timestamps", 2},
{"VK_AMD_shader_core_properties", 2},
- {"VK_EXT_video_decode_h265", 2},
+ {"VK_EXT_video_decode_h265", 3},
{"VK_KHR_global_priority", 1},
{"VK_AMD_memory_overallocation_behavior", 1},
{"VK_EXT_vertex_attribute_divisor", 3},
@@ -283,7 +283,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
{"VK_KHR_present_id", 1},
{"VK_EXT_private_data", 1},
{"VK_EXT_pipeline_creation_cache_control", 3},
- {"VK_KHR_video_encode_queue", 4},
+ {"VK_KHR_video_encode_queue", 5},
{"VK_NV_device_diagnostics_config", 1},
{"VK_QCOM_render_pass_store_ops", 2},
{"VK_KHR_synchronization2", 1},
@@ -320,6 +320,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
{"VK_EXT_global_priority_query", 1},
{"VK_EXT_image_view_min_lod", 1},
{"VK_EXT_multi_draw", 1},
+ {"VK_EXT_image_2d_view_of_3d", 1},
{"VK_EXT_load_store_op_none", 1},
{"VK_EXT_border_color_swizzle", 1},
{"VK_EXT_pageable_device_local_memory", 1},
@@ -3505,6 +3506,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdDrawMultiIndexedEXT(
+
static VKAPI_ATTR void VKAPI_CALL SetDeviceMemoryPriorityEXT(
VkDevice device,
VkDeviceMemory memory,
diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h
index 562c12a8..2aec6a79 100644
--- a/icd/generated/vk_typemap_helper.h
+++ b/icd/generated/vk_typemap_helper.h
@@ -5676,6 +5676,15 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_PROP
typedef VkPhysicalDeviceMultiDrawPropertiesEXT Type;
};
+// Map type VkPhysicalDeviceImage2DViewOf3DFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_2D_VIEW_OF_3D_FEATURES_EXT
+template <> struct LvlTypeMap<VkPhysicalDeviceImage2DViewOf3DFeaturesEXT> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_2D_VIEW_OF_3D_FEATURES_EXT;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_2D_VIEW_OF_3D_FEATURES_EXT> {
+ typedef VkPhysicalDeviceImage2DViewOf3DFeaturesEXT Type;
+};
+
// Map type VkPhysicalDeviceBorderColorSwizzleFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT
template <> struct LvlTypeMap<VkPhysicalDeviceBorderColorSwizzleFeaturesEXT> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT;
diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py
index 1ccd951f..eb436c27 100755
--- a/scripts/generate_vulkan_wrapper.py
+++ b/scripts/generate_vulkan_wrapper.py
@@ -1267,6 +1267,9 @@ VK_EXT_multi_draw = Extension(name='VK_EXT_multi_draw', version=1, guard=None, c
Command(name='vkCmdDrawMultiIndexedEXT', dispatch='VkCommandBuffer'),
])
+VK_EXT_image_2d_view_of_3d = Extension(name='VK_EXT_image_2d_view_of_3d', version=1, guard=None, commands=[
+])
+
VK_EXT_load_store_op_none = Extension(name='VK_EXT_load_store_op_none', version=1, guard=None, commands=[
])
@@ -1458,27 +1461,27 @@ VK_KHR_video_queue = Extension(name='VK_KHR_video_queue', version=3, guard='VK_E
Command(name='vkCmdControlVideoCodingKHR', dispatch='VkCommandBuffer'),
])
-VK_KHR_video_decode_queue = Extension(name='VK_KHR_video_decode_queue', version=3, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
+VK_KHR_video_decode_queue = Extension(name='VK_KHR_video_decode_queue', version=4, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
Command(name='vkCmdDecodeVideoKHR', dispatch='VkCommandBuffer'),
])
VK_KHR_portability_subset = Extension(name='VK_KHR_portability_subset', version=1, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
])
-VK_KHR_video_encode_queue = Extension(name='VK_KHR_video_encode_queue', version=4, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
+VK_KHR_video_encode_queue = Extension(name='VK_KHR_video_encode_queue', version=5, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
Command(name='vkCmdEncodeVideoKHR', dispatch='VkCommandBuffer'),
])
VK_EXT_video_encode_h264 = Extension(name='VK_EXT_video_encode_h264', version=6, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
])
-VK_EXT_video_encode_h265 = Extension(name='VK_EXT_video_encode_h265', version=6, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
+VK_EXT_video_encode_h265 = Extension(name='VK_EXT_video_encode_h265', version=7, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
])
-VK_EXT_video_decode_h264 = Extension(name='VK_EXT_video_decode_h264', version=4, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
+VK_EXT_video_decode_h264 = Extension(name='VK_EXT_video_decode_h264', version=5, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
])
-VK_EXT_video_decode_h265 = Extension(name='VK_EXT_video_decode_h265', version=2, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
+VK_EXT_video_decode_h265 = Extension(name='VK_EXT_video_decode_h265', version=3, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[
])
extensions = [
@@ -1718,6 +1721,7 @@ extensions = [
VK_EXT_global_priority_query,
VK_EXT_image_view_min_lod,
VK_EXT_multi_draw,
+ VK_EXT_image_2d_view_of_3d,
VK_EXT_load_store_op_none,
VK_EXT_border_color_swizzle,
VK_EXT_pageable_device_local_memory,
diff --git a/scripts/known_good.json b/scripts/known_good.json
index a374273d..d8a15a37 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.210"
+ "commit" : "v1.3.211"
},
{
"name" : "MoltenVK",
@@ -30,7 +30,7 @@
"sub_dir" : "Vulkan-Loader",
"build_dir" : "Vulkan-Loader/build",
"install_dir" : "Vulkan-Loader/build/install",
- "commit" : "v1.3.210",
+ "commit" : "v1.3.211",
"deps" : [
{
"var_name" : "VULKAN_HEADERS_INSTALL_DIR",
diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp
index b822f5ce..deedbaf8 100644
--- a/vulkaninfo/generated/vulkaninfo.hpp
+++ b/vulkaninfo/generated/vulkaninfo.hpp
@@ -1694,6 +1694,12 @@ void DumpVkPhysicalDeviceIDProperties(Printer &p, std::string name, const VkPhys
p.PrintKeyValue("deviceNodeMask", obj.deviceNodeMask);
p.PrintKeyBool("deviceLUIDValid", static_cast<bool>(obj.deviceLUIDValid));
}
+void DumpVkPhysicalDeviceImage2DViewOf3DFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceImage2DViewOf3DFeaturesEXT &obj) {
+ ObjectWrapper object{p, name};
+ p.SetMinKeyWidth(17);
+ p.PrintKeyBool("image2DViewOf3D", static_cast<bool>(obj.image2DViewOf3D));
+ p.PrintKeyBool("sampler2DViewOf3D", static_cast<bool>(obj.sampler2DViewOf3D));
+}
void DumpVkPhysicalDeviceImageRobustnessFeatures(Printer &p, std::string name, const VkPhysicalDeviceImageRobustnessFeatures &obj) {
ObjectWrapper object{p, name};
p.SetMinKeyWidth(17);
@@ -2952,6 +2958,7 @@ struct phys_device_features2_chain {
VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR PhysicalDeviceGlobalPriorityQueryFeaturesKHR{};
VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT{};
VkPhysicalDeviceHostQueryResetFeatures PhysicalDeviceHostQueryResetFeatures{};
+ VkPhysicalDeviceImage2DViewOf3DFeaturesEXT PhysicalDeviceImage2DViewOf3DFeaturesEXT{};
VkPhysicalDeviceImageRobustnessFeatures PhysicalDeviceImageRobustnessFeatures{};
VkPhysicalDeviceImageViewMinLodFeaturesEXT PhysicalDeviceImageViewMinLodFeaturesEXT{};
VkPhysicalDeviceImagelessFramebufferFeatures PhysicalDeviceImagelessFramebufferFeatures{};
@@ -3041,6 +3048,7 @@ struct phys_device_features2_chain {
PhysicalDeviceGlobalPriorityQueryFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR;
PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GRAPHICS_PIPELINE_LIBRARY_FEATURES_EXT;
PhysicalDeviceHostQueryResetFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES;
+ PhysicalDeviceImage2DViewOf3DFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_2D_VIEW_OF_3D_FEATURES_EXT;
PhysicalDeviceImageRobustnessFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES;
PhysicalDeviceImageViewMinLodFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT;
PhysicalDeviceImagelessFramebufferFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES;
@@ -3129,6 +3137,7 @@ struct phys_device_features2_chain {
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceGlobalPriorityQueryFeaturesKHR));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceHostQueryResetFeatures));
+ chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImage2DViewOf3DFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImageRobustnessFeatures));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImageViewMinLodFeaturesEXT));
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImagelessFramebufferFeatures));
@@ -3788,6 +3797,12 @@ void chain_iterator_phys_device_features2(Printer &p, AppGpu &gpu, void * place)
DumpVkPhysicalDeviceHostQueryResetFeatures(p, gpu.api_version.minor >= 2 ?"VkPhysicalDeviceHostQueryResetFeatures":"VkPhysicalDeviceHostQueryResetFeaturesEXT", *props);
p.AddNewline();
}
+ if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_2D_VIEW_OF_3D_FEATURES_EXT &&
+ (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_IMAGE_2D_VIEW_OF_3D_EXTENSION_NAME))) {
+ VkPhysicalDeviceImage2DViewOf3DFeaturesEXT* props = (VkPhysicalDeviceImage2DViewOf3DFeaturesEXT*)structure;
+ DumpVkPhysicalDeviceImage2DViewOf3DFeaturesEXT(p, "VkPhysicalDeviceImage2DViewOf3DFeaturesEXT", *props);
+ p.AddNewline();
+ }
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES &&
(gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_IMAGE_ROBUSTNESS_EXTENSION_NAME) ||
gpu.api_version.minor >= 3)) {