aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMike Schuchardt <mikes@lunarg.com>2022-06-30 12:30:53 -0700
committerMike Schuchardt <mikes@lunarg.com>2022-06-30 13:39:39 -0700
commit1987cb23318300df39542d5483c97d08f71c4703 (patch)
tree75714a095d43c36314a2ad0ffeab294508c53419 /scripts
parent4643f73ec79d9a4755047aecae1817c646ca91b9 (diff)
downloadusermoji-1987cb23318300df39542d5483c97d08f71c4703.tar.xz
build: Update to header 1.3.219
- Update mock_icd generator create function detection to only look for Create/Allocate at beginning of function name - Update known-good - Generate source
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/generate_vulkan_wrapper.py10
-rw-r--r--scripts/known_good.json4
-rw-r--r--scripts/mock_icd_generator.py10
3 files changed, 17 insertions, 7 deletions
diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py
index 482681b0..f890c5c4 100755
--- a/scripts/generate_vulkan_wrapper.py
+++ b/scripts/generate_vulkan_wrapper.py
@@ -1259,6 +1259,9 @@ VK_EXT_pipeline_properties = Extension(name='VK_EXT_pipeline_properties', versio
Command(name='vkGetPipelinePropertiesEXT', dispatch='VkDevice'),
])
+VK_EXT_multisampled_render_to_single_sampled = Extension(name='VK_EXT_multisampled_render_to_single_sampled', version=1, guard=None, commands=[
+])
+
VK_EXT_extended_dynamic_state2 = Extension(name='VK_EXT_extended_dynamic_state2', version=1, guard=None, commands=[
Command(name='vkCmdSetPatchControlPointsEXT', dispatch='VkCommandBuffer'),
Command(name='vkCmdSetRasterizerDiscardEnableEXT', dispatch='VkCommandBuffer'),
@@ -1321,6 +1324,11 @@ VK_EXT_image_compression_control_swapchain = Extension(name='VK_EXT_image_compre
VK_EXT_subpass_merge_feedback = Extension(name='VK_EXT_subpass_merge_feedback', version=2, guard=None, commands=[
])
+VK_EXT_shader_module_identifier = Extension(name='VK_EXT_shader_module_identifier', version=1, guard=None, commands=[
+ Command(name='vkGetShaderModuleIdentifierEXT', dispatch='VkDevice'),
+ Command(name='vkGetShaderModuleCreateInfoIdentifierEXT', dispatch='VkDevice'),
+])
+
VK_KHR_acceleration_structure = Extension(name='VK_KHR_acceleration_structure', version=13, guard=None, commands=[
Command(name='vkCreateAccelerationStructureKHR', dispatch='VkDevice'),
Command(name='vkDestroyAccelerationStructureKHR', dispatch='VkDevice'),
@@ -1751,6 +1759,7 @@ extensions = [
VK_HUAWEI_invocation_mask,
VK_NV_external_memory_rdma,
VK_EXT_pipeline_properties,
+ VK_EXT_multisampled_render_to_single_sampled,
VK_EXT_extended_dynamic_state2,
VK_EXT_color_write_enable,
VK_EXT_primitives_generated_query,
@@ -1768,6 +1777,7 @@ extensions = [
VK_GOOGLE_surfaceless_query,
VK_EXT_image_compression_control_swapchain,
VK_EXT_subpass_merge_feedback,
+ VK_EXT_shader_module_identifier,
VK_KHR_acceleration_structure,
VK_KHR_ray_tracing_pipeline,
VK_KHR_ray_query,
diff --git a/scripts/known_good.json b/scripts/known_good.json
index 3e4835d6..874868b8 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.218"
+ "commit" : "v1.3.219"
},
{
"name" : "MoltenVK",
@@ -30,7 +30,7 @@
"sub_dir" : "Vulkan-Loader",
"build_dir" : "Vulkan-Loader/build",
"install_dir" : "Vulkan-Loader/build/install",
- "commit" : "v1.3.218",
+ "commit" : "v1.3.219",
"deps" : [
{
"var_name" : "VULKAN_HEADERS_INSTALL_DIR",
diff --git a/scripts/mock_icd_generator.py b/scripts/mock_icd_generator.py
index 7ad385a4..bf366fea 100644
--- a/scripts/mock_icd_generator.py
+++ b/scripts/mock_icd_generator.py
@@ -1,9 +1,9 @@
#!/usr/bin/python3 -i
#
-# Copyright (c) 2015-2021 The Khronos Group Inc.
-# Copyright (c) 2015-2021 Valve Corporation
-# Copyright (c) 2015-2021 LunarG, Inc.
-# Copyright (c) 2015-2021 Google Inc.
+# Copyright (c) 2015-2022 The Khronos Group Inc.
+# Copyright (c) 2015-2022 Valve Corporation
+# Copyright (c) 2015-2022 LunarG, Inc.
+# Copyright (c) 2015-2022 Google Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -1434,7 +1434,7 @@ class MockICDOutputGenerator(OutputGenerator):
api_function_name = cmdinfo.elem.attrib.get('name')
# GET THE TYPE OF FUNCTION
- if True in [ftxt in api_function_name for ftxt in ['Create', 'Allocate']]:
+ if any(api_function_name.startswith(ftxt) for ftxt in ('vkCreate', 'vkAllocate')):
# Get last param
last_param = cmdinfo.elem.findall('param')[-1]
lp_txt = last_param.find('name').text