Dylan Aïssi pushed to branch upstream at X Strike Force / vulkan / vulkan-volk
Commits:
-
c3914e5d
by Dylan Aïssi at 2023-02-07T17:08:12+01:00
6 changed files:
Changes:
... | ... | @@ -23,3 +23,4 @@ jobs: |
23 | 23 | commit-message: Update to 1.3.${{env.VOLK_VERSION}}
|
24 | 24 | title: Update to 1.3.${{env.VOLK_VERSION}}
|
25 | 25 | author: GitHub <noreply@github.com>
|
26 | + token: ${{ secrets.REPO_SCOPED_TOKEN }} |
... | ... | @@ -4,7 +4,7 @@ cmake_policy(SET CMP0048 NEW) # project(... VERSION ...) support |
4 | 4 | |
5 | 5 | project(volk VERSION
|
6 | 6 | # VOLK_GENERATE_VERSION
|
7 | -236
|
|
7 | +239
|
|
8 | 8 | # VOLK_GENERATE_VERSION
|
9 | 9 | LANGUAGES C
|
10 | 10 | )
|
1 | -Copyright (c) 2018-2022 Arseny Kapoulkine
|
|
1 | +Copyright (c) 2018-2023 Arseny Kapoulkine
|
|
2 | 2 | |
3 | 3 | Permission is hereby granted, free of charge, to any person obtaining a copy
|
4 | 4 | of this software and associated documentation files (the "Software"), to deal
|
... | ... | @@ -72,13 +72,16 @@ if __name__ == "__main__": |
72 | 72 | instance_commands = set()
|
73 | 73 | |
74 | 74 | for feature in spec.findall('feature'):
|
75 | + api = feature.get('api')
|
|
76 | + if 'vulkan' not in api.split(','):
|
|
77 | + continue
|
|
75 | 78 | key = defined(feature.get('name'))
|
76 | 79 | cmdrefs = feature.findall('require/command')
|
77 | 80 | command_groups[key] = [cmdref.get('name') for cmdref in cmdrefs]
|
78 | 81 | |
79 | 82 | for ext in sorted(spec.findall('extensions/extension'), key=lambda ext: ext.get('name')):
|
80 | 83 | supported = ext.get('supported')
|
81 | - if supported == 'disabled':
|
|
84 | + if 'vulkan' not in supported.split(','):
|
|
82 | 85 | continue
|
83 | 86 | name = ext.get('name')
|
84 | 87 | type = ext.get('type')
|
... | ... | @@ -734,6 +734,9 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c |
734 | 734 | vkGetShaderModuleCreateInfoIdentifierEXT = (PFN_vkGetShaderModuleCreateInfoIdentifierEXT)load(context, "vkGetShaderModuleCreateInfoIdentifierEXT");
|
735 | 735 | vkGetShaderModuleIdentifierEXT = (PFN_vkGetShaderModuleIdentifierEXT)load(context, "vkGetShaderModuleIdentifierEXT");
|
736 | 736 | #endif /* defined(VK_EXT_shader_module_identifier) */
|
737 | +#if defined(VK_EXT_swapchain_maintenance1)
|
|
738 | + vkReleaseSwapchainImagesEXT = (PFN_vkReleaseSwapchainImagesEXT)load(context, "vkReleaseSwapchainImagesEXT");
|
|
739 | +#endif /* defined(VK_EXT_swapchain_maintenance1) */
|
|
737 | 740 | #if defined(VK_EXT_transform_feedback)
|
738 | 741 | vkCmdBeginQueryIndexedEXT = (PFN_vkCmdBeginQueryIndexedEXT)load(context, "vkCmdBeginQueryIndexedEXT");
|
739 | 742 | vkCmdBeginTransformFeedbackEXT = (PFN_vkCmdBeginTransformFeedbackEXT)load(context, "vkCmdBeginTransformFeedbackEXT");
|
... | ... | @@ -770,6 +773,10 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c |
770 | 773 | vkGetPastPresentationTimingGOOGLE = (PFN_vkGetPastPresentationTimingGOOGLE)load(context, "vkGetPastPresentationTimingGOOGLE");
|
771 | 774 | vkGetRefreshCycleDurationGOOGLE = (PFN_vkGetRefreshCycleDurationGOOGLE)load(context, "vkGetRefreshCycleDurationGOOGLE");
|
772 | 775 | #endif /* defined(VK_GOOGLE_display_timing) */
|
776 | +#if defined(VK_HUAWEI_cluster_culling_shader)
|
|
777 | + vkCmdDrawClusterHUAWEI = (PFN_vkCmdDrawClusterHUAWEI)load(context, "vkCmdDrawClusterHUAWEI");
|
|
778 | + vkCmdDrawClusterIndirectHUAWEI = (PFN_vkCmdDrawClusterIndirectHUAWEI)load(context, "vkCmdDrawClusterIndirectHUAWEI");
|
|
779 | +#endif /* defined(VK_HUAWEI_cluster_culling_shader) */
|
|
773 | 780 | #if defined(VK_HUAWEI_invocation_mask)
|
774 | 781 | vkCmdBindInvocationMaskHUAWEI = (PFN_vkCmdBindInvocationMaskHUAWEI)load(context, "vkCmdBindInvocationMaskHUAWEI");
|
775 | 782 | #endif /* defined(VK_HUAWEI_invocation_mask) */
|
... | ... | @@ -1461,6 +1468,9 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context, |
1461 | 1468 | table->vkGetShaderModuleCreateInfoIdentifierEXT = (PFN_vkGetShaderModuleCreateInfoIdentifierEXT)load(context, "vkGetShaderModuleCreateInfoIdentifierEXT");
|
1462 | 1469 | table->vkGetShaderModuleIdentifierEXT = (PFN_vkGetShaderModuleIdentifierEXT)load(context, "vkGetShaderModuleIdentifierEXT");
|
1463 | 1470 | #endif /* defined(VK_EXT_shader_module_identifier) */
|
1471 | +#if defined(VK_EXT_swapchain_maintenance1)
|
|
1472 | + table->vkReleaseSwapchainImagesEXT = (PFN_vkReleaseSwapchainImagesEXT)load(context, "vkReleaseSwapchainImagesEXT");
|
|
1473 | +#endif /* defined(VK_EXT_swapchain_maintenance1) */
|
|
1464 | 1474 | #if defined(VK_EXT_transform_feedback)
|
1465 | 1475 | table->vkCmdBeginQueryIndexedEXT = (PFN_vkCmdBeginQueryIndexedEXT)load(context, "vkCmdBeginQueryIndexedEXT");
|
1466 | 1476 | table->vkCmdBeginTransformFeedbackEXT = (PFN_vkCmdBeginTransformFeedbackEXT)load(context, "vkCmdBeginTransformFeedbackEXT");
|
... | ... | @@ -1497,6 +1507,10 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context, |
1497 | 1507 | table->vkGetPastPresentationTimingGOOGLE = (PFN_vkGetPastPresentationTimingGOOGLE)load(context, "vkGetPastPresentationTimingGOOGLE");
|
1498 | 1508 | table->vkGetRefreshCycleDurationGOOGLE = (PFN_vkGetRefreshCycleDurationGOOGLE)load(context, "vkGetRefreshCycleDurationGOOGLE");
|
1499 | 1509 | #endif /* defined(VK_GOOGLE_display_timing) */
|
1510 | +#if defined(VK_HUAWEI_cluster_culling_shader)
|
|
1511 | + table->vkCmdDrawClusterHUAWEI = (PFN_vkCmdDrawClusterHUAWEI)load(context, "vkCmdDrawClusterHUAWEI");
|
|
1512 | + table->vkCmdDrawClusterIndirectHUAWEI = (PFN_vkCmdDrawClusterIndirectHUAWEI)load(context, "vkCmdDrawClusterIndirectHUAWEI");
|
|
1513 | +#endif /* defined(VK_HUAWEI_cluster_culling_shader) */
|
|
1500 | 1514 | #if defined(VK_HUAWEI_invocation_mask)
|
1501 | 1515 | table->vkCmdBindInvocationMaskHUAWEI = (PFN_vkCmdBindInvocationMaskHUAWEI)load(context, "vkCmdBindInvocationMaskHUAWEI");
|
1502 | 1516 | #endif /* defined(VK_HUAWEI_invocation_mask) */
|
... | ... | @@ -2269,6 +2283,9 @@ PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT vkGetPhysicalDeviceMultisamplePr |
2269 | 2283 | PFN_vkGetShaderModuleCreateInfoIdentifierEXT vkGetShaderModuleCreateInfoIdentifierEXT;
|
2270 | 2284 | PFN_vkGetShaderModuleIdentifierEXT vkGetShaderModuleIdentifierEXT;
|
2271 | 2285 | #endif /* defined(VK_EXT_shader_module_identifier) */
|
2286 | +#if defined(VK_EXT_swapchain_maintenance1)
|
|
2287 | +PFN_vkReleaseSwapchainImagesEXT vkReleaseSwapchainImagesEXT;
|
|
2288 | +#endif /* defined(VK_EXT_swapchain_maintenance1) */
|
|
2272 | 2289 | #if defined(VK_EXT_tooling_info)
|
2273 | 2290 | PFN_vkGetPhysicalDeviceToolPropertiesEXT vkGetPhysicalDeviceToolPropertiesEXT;
|
2274 | 2291 | #endif /* defined(VK_EXT_tooling_info) */
|
... | ... | @@ -2314,6 +2331,10 @@ PFN_vkCreateStreamDescriptorSurfaceGGP vkCreateStreamDescriptorSurfaceGGP; |
2314 | 2331 | PFN_vkGetPastPresentationTimingGOOGLE vkGetPastPresentationTimingGOOGLE;
|
2315 | 2332 | PFN_vkGetRefreshCycleDurationGOOGLE vkGetRefreshCycleDurationGOOGLE;
|
2316 | 2333 | #endif /* defined(VK_GOOGLE_display_timing) */
|
2334 | +#if defined(VK_HUAWEI_cluster_culling_shader)
|
|
2335 | +PFN_vkCmdDrawClusterHUAWEI vkCmdDrawClusterHUAWEI;
|
|
2336 | +PFN_vkCmdDrawClusterIndirectHUAWEI vkCmdDrawClusterIndirectHUAWEI;
|
|
2337 | +#endif /* defined(VK_HUAWEI_cluster_culling_shader) */
|
|
2317 | 2338 | #if defined(VK_HUAWEI_invocation_mask)
|
2318 | 2339 | PFN_vkCmdBindInvocationMaskHUAWEI vkCmdBindInvocationMaskHUAWEI;
|
2319 | 2340 | #endif /* defined(VK_HUAWEI_invocation_mask) */
|
1 | 1 | /**
|
2 | 2 | * volk
|
3 | 3 | *
|
4 | - * Copyright (C) 2018-2022, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
|
|
4 | + * Copyright (C) 2018-2023, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
|
|
5 | 5 | * Report bugs and download new versions at https://github.com/zeux/volk
|
6 | 6 | *
|
7 | 7 | * This library is distributed under the MIT License. See notice at the end of this file.
|
... | ... | @@ -15,7 +15,7 @@ |
15 | 15 | #endif
|
16 | 16 | |
17 | 17 | /* VOLK_GENERATE_VERSION_DEFINE */
|
18 | -#define VOLK_HEADER_VERSION 236
|
|
18 | +#define VOLK_HEADER_VERSION 239
|
|
19 | 19 | /* VOLK_GENERATE_VERSION_DEFINE */
|
20 | 20 | |
21 | 21 | #ifndef VK_NO_PROTOTYPES
|
... | ... | @@ -23,8 +23,8 @@ |
23 | 23 | #endif
|
24 | 24 | |
25 | 25 | #ifndef VULKAN_H_
|
26 | -# ifdef VOLK_VULKAN_H_PATH
|
|
27 | -# include VOLK_VULKAN_H_PATH
|
|
26 | +# ifdef VOLK_VULKAN_H_PATH
|
|
27 | +# include VOLK_VULKAN_H_PATH
|
|
28 | 28 | # elif defined(VK_USE_PLATFORM_WIN32_KHR)
|
29 | 29 | # include <vulkan/vk_platform.h>
|
30 | 30 | # include <vulkan/vulkan_core.h>
|
... | ... | @@ -510,6 +510,9 @@ struct VolkDeviceTable |
510 | 510 | PFN_vkGetShaderModuleCreateInfoIdentifierEXT vkGetShaderModuleCreateInfoIdentifierEXT;
|
511 | 511 | PFN_vkGetShaderModuleIdentifierEXT vkGetShaderModuleIdentifierEXT;
|
512 | 512 | #endif /* defined(VK_EXT_shader_module_identifier) */
|
513 | +#if defined(VK_EXT_swapchain_maintenance1)
|
|
514 | + PFN_vkReleaseSwapchainImagesEXT vkReleaseSwapchainImagesEXT;
|
|
515 | +#endif /* defined(VK_EXT_swapchain_maintenance1) */
|
|
513 | 516 | #if defined(VK_EXT_transform_feedback)
|
514 | 517 | PFN_vkCmdBeginQueryIndexedEXT vkCmdBeginQueryIndexedEXT;
|
515 | 518 | PFN_vkCmdBeginTransformFeedbackEXT vkCmdBeginTransformFeedbackEXT;
|
... | ... | @@ -546,6 +549,10 @@ struct VolkDeviceTable |
546 | 549 | PFN_vkGetPastPresentationTimingGOOGLE vkGetPastPresentationTimingGOOGLE;
|
547 | 550 | PFN_vkGetRefreshCycleDurationGOOGLE vkGetRefreshCycleDurationGOOGLE;
|
548 | 551 | #endif /* defined(VK_GOOGLE_display_timing) */
|
552 | +#if defined(VK_HUAWEI_cluster_culling_shader)
|
|
553 | + PFN_vkCmdDrawClusterHUAWEI vkCmdDrawClusterHUAWEI;
|
|
554 | + PFN_vkCmdDrawClusterIndirectHUAWEI vkCmdDrawClusterIndirectHUAWEI;
|
|
555 | +#endif /* defined(VK_HUAWEI_cluster_culling_shader) */
|
|
549 | 556 | #if defined(VK_HUAWEI_invocation_mask)
|
550 | 557 | PFN_vkCmdBindInvocationMaskHUAWEI vkCmdBindInvocationMaskHUAWEI;
|
551 | 558 | #endif /* defined(VK_HUAWEI_invocation_mask) */
|
... | ... | @@ -1310,6 +1317,9 @@ extern PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT vkGetPhysicalDeviceMultis |
1310 | 1317 | extern PFN_vkGetShaderModuleCreateInfoIdentifierEXT vkGetShaderModuleCreateInfoIdentifierEXT;
|
1311 | 1318 | extern PFN_vkGetShaderModuleIdentifierEXT vkGetShaderModuleIdentifierEXT;
|
1312 | 1319 | #endif /* defined(VK_EXT_shader_module_identifier) */
|
1320 | +#if defined(VK_EXT_swapchain_maintenance1)
|
|
1321 | +extern PFN_vkReleaseSwapchainImagesEXT vkReleaseSwapchainImagesEXT;
|
|
1322 | +#endif /* defined(VK_EXT_swapchain_maintenance1) */
|
|
1313 | 1323 | #if defined(VK_EXT_tooling_info)
|
1314 | 1324 | extern PFN_vkGetPhysicalDeviceToolPropertiesEXT vkGetPhysicalDeviceToolPropertiesEXT;
|
1315 | 1325 | #endif /* defined(VK_EXT_tooling_info) */
|
... | ... | @@ -1355,6 +1365,10 @@ extern PFN_vkCreateStreamDescriptorSurfaceGGP vkCreateStreamDescriptorSurfaceGGP |
1355 | 1365 | extern PFN_vkGetPastPresentationTimingGOOGLE vkGetPastPresentationTimingGOOGLE;
|
1356 | 1366 | extern PFN_vkGetRefreshCycleDurationGOOGLE vkGetRefreshCycleDurationGOOGLE;
|
1357 | 1367 | #endif /* defined(VK_GOOGLE_display_timing) */
|
1368 | +#if defined(VK_HUAWEI_cluster_culling_shader)
|
|
1369 | +extern PFN_vkCmdDrawClusterHUAWEI vkCmdDrawClusterHUAWEI;
|
|
1370 | +extern PFN_vkCmdDrawClusterIndirectHUAWEI vkCmdDrawClusterIndirectHUAWEI;
|
|
1371 | +#endif /* defined(VK_HUAWEI_cluster_culling_shader) */
|
|
1358 | 1372 | #if defined(VK_HUAWEI_invocation_mask)
|
1359 | 1373 | extern PFN_vkCmdBindInvocationMaskHUAWEI vkCmdBindInvocationMaskHUAWEI;
|
1360 | 1374 | #endif /* defined(VK_HUAWEI_invocation_mask) */
|
... | ... | @@ -1776,7 +1790,7 @@ extern PFN_vkAcquireNextImage2KHR vkAcquireNextImage2KHR; |
1776 | 1790 | #endif
|
1777 | 1791 | |
1778 | 1792 | /**
|
1779 | - * Copyright (c) 2018-2022 Arseny Kapoulkine
|
|
1793 | + * Copyright (c) 2018-2023 Arseny Kapoulkine
|
|
1780 | 1794 | *
|
1781 | 1795 | * Permission is hereby granted, free of charge, to any person obtaining a copy
|
1782 | 1796 | * of this software and associated documentation files (the "Software"), to deal
|