aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMike Schuchardt <mikes@lunarg.com>2021-06-21 10:10:48 -0700
committerMike Schuchardt <mikes@lunarg.com>2021-06-21 11:13:05 -0700
commitdbd221b2bc7acbfe993be40fbfbf4f4a0a1ed816 (patch)
tree0a61806c77d9f80f1fad531d9529308d79a8173d /scripts
parenta680671d95bf7b3846cb20f1cbfc1c405db0511b (diff)
downloadusermoji-dbd221b2bc7acbfe993be40fbfbf4f4a0a1ed816.tar.xz
build: Update to header 1.2.182
- Update known-good - Add support for printing `int64_t` in `scripts/vulkaninfo_generator.py` - Disable codegen for VK_HUAWEI_subpass_shading KhronosGroup/Vulkan-Docs#1564 - Generate source Change-Id: I4417e99ed37da510bfaf94d676e22ac3fb088d5d
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/generate_source.py1
-rwxr-xr-xscripts/generate_vulkan_wrapper.py26
-rw-r--r--scripts/known_good.json4
-rw-r--r--scripts/vulkaninfo_generator.py2
4 files changed, 30 insertions, 3 deletions
diff --git a/scripts/generate_source.py b/scripts/generate_source.py
index a2002aae..301b7cad 100755
--- a/scripts/generate_source.py
+++ b/scripts/generate_source.py
@@ -66,6 +66,7 @@ def main(argv):
cmd = [common_codegen.repo_relative(os.path.join('scripts','kvt_genvk.py')),
'-registry', os.path.abspath(os.path.join(args.registry, 'vk.xml')),
+ '-removeExtensions', 'VK_HUAWEI_subpass_shading',
'-quiet', '-directory', output_path, filename]
print(' '.join(cmd))
try:
diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py
index 344f1a75..392aa353 100755
--- a/scripts/generate_vulkan_wrapper.py
+++ b/scripts/generate_vulkan_wrapper.py
@@ -1073,6 +1073,11 @@ VK_QCOM_render_pass_transform = Extension(name='VK_QCOM_render_pass_transform',
VK_EXT_device_memory_report = Extension(name='VK_EXT_device_memory_report', version=2, guard=None, commands=[
])
+VK_EXT_acquire_drm_display = Extension(name='VK_EXT_acquire_drm_display', version=1, guard=None, commands=[
+ Command(name='vkAcquireDrmDisplayEXT', dispatch='VkPhysicalDevice'),
+ Command(name='vkGetDrmDisplayEXT', dispatch='VkPhysicalDevice'),
+])
+
VK_EXT_robustness2 = Extension(name='VK_EXT_robustness2', version=1, guard=None, commands=[
])
@@ -1102,6 +1107,9 @@ VK_NV_fragment_shading_rate_enums = Extension(name='VK_NV_fragment_shading_rate_
Command(name='vkCmdSetFragmentShadingRateEnumNV', dispatch='VkCommandBuffer'),
])
+VK_NV_ray_tracing_motion_blur = Extension(name='VK_NV_ray_tracing_motion_blur', version=1, guard=None, commands=[
+])
+
VK_EXT_ycbcr_2plane_444_formats = Extension(name='VK_EXT_ycbcr_2plane_444_formats', version=1, guard=None, commands=[
])
@@ -1129,6 +1137,14 @@ VK_EXT_vertex_input_dynamic_state = Extension(name='VK_EXT_vertex_input_dynamic_
Command(name='vkCmdSetVertexInputEXT', dispatch='VkCommandBuffer'),
])
+VK_EXT_physical_device_drm = Extension(name='VK_EXT_physical_device_drm', version=1, guard=None, commands=[
+])
+
+VK_HUAWEI_subpass_shading = Extension(name='VK_HUAWEI_subpass_shading', version=0, guard=None, commands=[
+ Command(name='vkGetSubpassShadingMaxWorkgroupSizeHUAWEI', dispatch='VkRenderPass'),
+ Command(name='vkCmdSubpassShadingHUAWEI', dispatch='VkCommandBuffer'),
+])
+
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'),
@@ -1144,6 +1160,11 @@ VK_EXT_color_write_enable = Extension(name='VK_EXT_color_write_enable', version=
VK_EXT_global_priority_query = Extension(name='VK_EXT_global_priority_query', version=1, guard=None, commands=[
])
+VK_EXT_multi_draw = Extension(name='VK_EXT_multi_draw', version=1, guard=None, commands=[
+ Command(name='vkCmdDrawMultiEXT', dispatch='VkCommandBuffer'),
+ Command(name='vkCmdDrawMultiIndexedEXT', dispatch='VkCommandBuffer'),
+])
+
VK_KHR_acceleration_structure = Extension(name='VK_KHR_acceleration_structure', version=11, guard=None, commands=[
Command(name='vkCreateAccelerationStructureKHR', dispatch='VkDevice'),
Command(name='vkDestroyAccelerationStructureKHR', dispatch='VkDevice'),
@@ -1517,6 +1538,7 @@ extensions = [
VK_EXT_texel_buffer_alignment,
VK_QCOM_render_pass_transform,
VK_EXT_device_memory_report,
+ VK_EXT_acquire_drm_display,
VK_EXT_robustness2,
VK_EXT_custom_border_color,
VK_GOOGLE_user_type,
@@ -1525,6 +1547,7 @@ extensions = [
VK_NV_device_diagnostics_config,
VK_QCOM_render_pass_store_ops,
VK_NV_fragment_shading_rate_enums,
+ VK_NV_ray_tracing_motion_blur,
VK_EXT_ycbcr_2plane_444_formats,
VK_EXT_fragment_density_map2,
VK_QCOM_rotated_copy_commands,
@@ -1533,9 +1556,12 @@ extensions = [
VK_NV_acquire_winrt_display,
VK_VALVE_mutable_descriptor_type,
VK_EXT_vertex_input_dynamic_state,
+ VK_EXT_physical_device_drm,
+ VK_HUAWEI_subpass_shading,
VK_EXT_extended_dynamic_state2,
VK_EXT_color_write_enable,
VK_EXT_global_priority_query,
+ VK_EXT_multi_draw,
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 7cb4b0fe..72bdbe46 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.2.181"
+ "commit" : "v1.2.182"
},
{
"name" : "MoltenVK",
@@ -30,7 +30,7 @@
"sub_dir" : "Vulkan-Loader",
"build_dir" : "Vulkan-Loader/build",
"install_dir" : "Vulkan-Loader/build/install",
- "commit" : "v1.2.181",
+ "commit" : "v1.2.182",
"deps" : [
{
"var_name" : "VULKAN_HEADERS_INSTALL_DIR",
diff --git a/scripts/vulkaninfo_generator.py b/scripts/vulkaninfo_generator.py
index 4bec23f3..fc4b145e 100644
--- a/scripts/vulkaninfo_generator.py
+++ b/scripts/vulkaninfo_generator.py
@@ -102,7 +102,7 @@ struct_blacklist = ['VkConformanceVersion']
# iostream or custom outputter handles these types
predefined_types = ['char', 'VkBool32', 'uint32_t', 'uint8_t', 'int32_t',
- 'float', 'uint64_t', 'size_t', 'VkDeviceSize']
+ 'float', 'uint64_t', 'size_t', 'VkDeviceSize', 'int64_t']
# Types that need pNext Chains built. 'extends' is the xml tag used in the structextends member. 'type' can be device, instance, or both
EXTENSION_CATEGORIES = OrderedDict((('phys_device_props2', {'extends': 'VkPhysicalDeviceProperties2', 'type': 'both'}),