Skip to content

Commit 0b17a76

Browse files
github-actions[bot]github-actions[bot]
authored
Merge pull request #216 from zeux/update/304
Update to 1.4.304
2 parents e767d0e + a776ece commit 0b17a76

File tree

3 files changed

+32
-12
lines changed

3 files changed

+32
-12
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5...3.30)
22

33
project(volk VERSION
44
# VOLK_GENERATE_VERSION
5-
303
5+
304
66
# VOLK_GENERATE_VERSION
77
LANGUAGES C
88
)

‎volk.c

+18-6
Original file line numberDiff line numberDiff line change
@@ -770,9 +770,11 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
770770
#endif /* defined(VK_EXT_line_rasterization) */
771771
#if defined(VK_EXT_mesh_shader)
772772
vkCmdDrawMeshTasksEXT = (PFN_vkCmdDrawMeshTasksEXT)load(context, "vkCmdDrawMeshTasksEXT");
773-
vkCmdDrawMeshTasksIndirectCountEXT = (PFN_vkCmdDrawMeshTasksIndirectCountEXT)load(context, "vkCmdDrawMeshTasksIndirectCountEXT");
774773
vkCmdDrawMeshTasksIndirectEXT = (PFN_vkCmdDrawMeshTasksIndirectEXT)load(context, "vkCmdDrawMeshTasksIndirectEXT");
775774
#endif /* defined(VK_EXT_mesh_shader) */
775+
#if defined(VK_EXT_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2))
776+
vkCmdDrawMeshTasksIndirectCountEXT = (PFN_vkCmdDrawMeshTasksIndirectCountEXT)load(context, "vkCmdDrawMeshTasksIndirectCountEXT");
777+
#endif /* defined(VK_EXT_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2)) */
776778
#if defined(VK_EXT_metal_objects)
777779
vkExportMetalObjectsEXT = (PFN_vkExportMetalObjectsEXT)load(context, "vkExportMetalObjectsEXT");
778780
#endif /* defined(VK_EXT_metal_objects) */
@@ -1177,10 +1179,12 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
11771179
vkCmdDecompressMemoryNV = (PFN_vkCmdDecompressMemoryNV)load(context, "vkCmdDecompressMemoryNV");
11781180
#endif /* defined(VK_NV_memory_decompression) */
11791181
#if defined(VK_NV_mesh_shader)
1180-
vkCmdDrawMeshTasksIndirectCountNV = (PFN_vkCmdDrawMeshTasksIndirectCountNV)load(context, "vkCmdDrawMeshTasksIndirectCountNV");
11811182
vkCmdDrawMeshTasksIndirectNV = (PFN_vkCmdDrawMeshTasksIndirectNV)load(context, "vkCmdDrawMeshTasksIndirectNV");
11821183
vkCmdDrawMeshTasksNV = (PFN_vkCmdDrawMeshTasksNV)load(context, "vkCmdDrawMeshTasksNV");
11831184
#endif /* defined(VK_NV_mesh_shader) */
1185+
#if defined(VK_NV_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2))
1186+
vkCmdDrawMeshTasksIndirectCountNV = (PFN_vkCmdDrawMeshTasksIndirectCountNV)load(context, "vkCmdDrawMeshTasksIndirectCountNV");
1187+
#endif /* defined(VK_NV_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2)) */
11841188
#if defined(VK_NV_optical_flow)
11851189
vkBindOpticalFlowSessionImageNV = (PFN_vkBindOpticalFlowSessionImageNV)load(context, "vkBindOpticalFlowSessionImageNV");
11861190
vkCmdOpticalFlowExecuteNV = (PFN_vkCmdOpticalFlowExecuteNV)load(context, "vkCmdOpticalFlowExecuteNV");
@@ -1678,9 +1682,11 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
16781682
#endif /* defined(VK_EXT_line_rasterization) */
16791683
#if defined(VK_EXT_mesh_shader)
16801684
table->vkCmdDrawMeshTasksEXT = (PFN_vkCmdDrawMeshTasksEXT)load(context, "vkCmdDrawMeshTasksEXT");
1681-
table->vkCmdDrawMeshTasksIndirectCountEXT = (PFN_vkCmdDrawMeshTasksIndirectCountEXT)load(context, "vkCmdDrawMeshTasksIndirectCountEXT");
16821685
table->vkCmdDrawMeshTasksIndirectEXT = (PFN_vkCmdDrawMeshTasksIndirectEXT)load(context, "vkCmdDrawMeshTasksIndirectEXT");
16831686
#endif /* defined(VK_EXT_mesh_shader) */
1687+
#if defined(VK_EXT_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2))
1688+
table->vkCmdDrawMeshTasksIndirectCountEXT = (PFN_vkCmdDrawMeshTasksIndirectCountEXT)load(context, "vkCmdDrawMeshTasksIndirectCountEXT");
1689+
#endif /* defined(VK_EXT_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2)) */
16841690
#if defined(VK_EXT_metal_objects)
16851691
table->vkExportMetalObjectsEXT = (PFN_vkExportMetalObjectsEXT)load(context, "vkExportMetalObjectsEXT");
16861692
#endif /* defined(VK_EXT_metal_objects) */
@@ -2085,10 +2091,12 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
20852091
table->vkCmdDecompressMemoryNV = (PFN_vkCmdDecompressMemoryNV)load(context, "vkCmdDecompressMemoryNV");
20862092
#endif /* defined(VK_NV_memory_decompression) */
20872093
#if defined(VK_NV_mesh_shader)
2088-
table->vkCmdDrawMeshTasksIndirectCountNV = (PFN_vkCmdDrawMeshTasksIndirectCountNV)load(context, "vkCmdDrawMeshTasksIndirectCountNV");
20892094
table->vkCmdDrawMeshTasksIndirectNV = (PFN_vkCmdDrawMeshTasksIndirectNV)load(context, "vkCmdDrawMeshTasksIndirectNV");
20902095
table->vkCmdDrawMeshTasksNV = (PFN_vkCmdDrawMeshTasksNV)load(context, "vkCmdDrawMeshTasksNV");
20912096
#endif /* defined(VK_NV_mesh_shader) */
2097+
#if defined(VK_NV_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2))
2098+
table->vkCmdDrawMeshTasksIndirectCountNV = (PFN_vkCmdDrawMeshTasksIndirectCountNV)load(context, "vkCmdDrawMeshTasksIndirectCountNV");
2099+
#endif /* defined(VK_NV_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2)) */
20922100
#if defined(VK_NV_optical_flow)
20932101
table->vkBindOpticalFlowSessionImageNV = (PFN_vkBindOpticalFlowSessionImageNV)load(context, "vkBindOpticalFlowSessionImageNV");
20942102
table->vkCmdOpticalFlowExecuteNV = (PFN_vkCmdOpticalFlowExecuteNV)load(context, "vkCmdOpticalFlowExecuteNV");
@@ -2663,9 +2671,11 @@ PFN_vkCmdSetLineStippleEXT vkCmdSetLineStippleEXT;
26632671
#endif /* defined(VK_EXT_line_rasterization) */
26642672
#if defined(VK_EXT_mesh_shader)
26652673
PFN_vkCmdDrawMeshTasksEXT vkCmdDrawMeshTasksEXT;
2666-
PFN_vkCmdDrawMeshTasksIndirectCountEXT vkCmdDrawMeshTasksIndirectCountEXT;
26672674
PFN_vkCmdDrawMeshTasksIndirectEXT vkCmdDrawMeshTasksIndirectEXT;
26682675
#endif /* defined(VK_EXT_mesh_shader) */
2676+
#if defined(VK_EXT_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2))
2677+
PFN_vkCmdDrawMeshTasksIndirectCountEXT vkCmdDrawMeshTasksIndirectCountEXT;
2678+
#endif /* defined(VK_EXT_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2)) */
26692679
#if defined(VK_EXT_metal_objects)
26702680
PFN_vkExportMetalObjectsEXT vkExportMetalObjectsEXT;
26712681
#endif /* defined(VK_EXT_metal_objects) */
@@ -3184,10 +3194,12 @@ PFN_vkCmdDecompressMemoryIndirectCountNV vkCmdDecompressMemoryIndirectCountNV;
31843194
PFN_vkCmdDecompressMemoryNV vkCmdDecompressMemoryNV;
31853195
#endif /* defined(VK_NV_memory_decompression) */
31863196
#if defined(VK_NV_mesh_shader)
3187-
PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV;
31883197
PFN_vkCmdDrawMeshTasksIndirectNV vkCmdDrawMeshTasksIndirectNV;
31893198
PFN_vkCmdDrawMeshTasksNV vkCmdDrawMeshTasksNV;
31903199
#endif /* defined(VK_NV_mesh_shader) */
3200+
#if defined(VK_NV_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2))
3201+
PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV;
3202+
#endif /* defined(VK_NV_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2)) */
31913203
#if defined(VK_NV_optical_flow)
31923204
PFN_vkBindOpticalFlowSessionImageNV vkBindOpticalFlowSessionImageNV;
31933205
PFN_vkCmdOpticalFlowExecuteNV vkCmdOpticalFlowExecuteNV;

‎volk.h

+13-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#endif
1616

1717
/* VOLK_GENERATE_VERSION_DEFINE */
18-
#define VOLK_HEADER_VERSION 303
18+
#define VOLK_HEADER_VERSION 304
1919
/* VOLK_GENERATE_VERSION_DEFINE */
2020

2121
#ifndef VK_NO_PROTOTYPES
@@ -474,9 +474,11 @@ struct VolkDeviceTable
474474
#endif /* defined(VK_EXT_line_rasterization) */
475475
#if defined(VK_EXT_mesh_shader)
476476
PFN_vkCmdDrawMeshTasksEXT vkCmdDrawMeshTasksEXT;
477-
PFN_vkCmdDrawMeshTasksIndirectCountEXT vkCmdDrawMeshTasksIndirectCountEXT;
478477
PFN_vkCmdDrawMeshTasksIndirectEXT vkCmdDrawMeshTasksIndirectEXT;
479478
#endif /* defined(VK_EXT_mesh_shader) */
479+
#if defined(VK_EXT_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2))
480+
PFN_vkCmdDrawMeshTasksIndirectCountEXT vkCmdDrawMeshTasksIndirectCountEXT;
481+
#endif /* defined(VK_EXT_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2)) */
480482
#if defined(VK_EXT_metal_objects)
481483
PFN_vkExportMetalObjectsEXT vkExportMetalObjectsEXT;
482484
#endif /* defined(VK_EXT_metal_objects) */
@@ -881,10 +883,12 @@ struct VolkDeviceTable
881883
PFN_vkCmdDecompressMemoryNV vkCmdDecompressMemoryNV;
882884
#endif /* defined(VK_NV_memory_decompression) */
883885
#if defined(VK_NV_mesh_shader)
884-
PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV;
885886
PFN_vkCmdDrawMeshTasksIndirectNV vkCmdDrawMeshTasksIndirectNV;
886887
PFN_vkCmdDrawMeshTasksNV vkCmdDrawMeshTasksNV;
887888
#endif /* defined(VK_NV_mesh_shader) */
889+
#if defined(VK_NV_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2))
890+
PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV;
891+
#endif /* defined(VK_NV_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2)) */
888892
#if defined(VK_NV_optical_flow)
889893
PFN_vkBindOpticalFlowSessionImageNV vkBindOpticalFlowSessionImageNV;
890894
PFN_vkCmdOpticalFlowExecuteNV vkCmdOpticalFlowExecuteNV;
@@ -1451,9 +1455,11 @@ extern PFN_vkCmdSetLineStippleEXT vkCmdSetLineStippleEXT;
14511455
#endif /* defined(VK_EXT_line_rasterization) */
14521456
#if defined(VK_EXT_mesh_shader)
14531457
extern PFN_vkCmdDrawMeshTasksEXT vkCmdDrawMeshTasksEXT;
1454-
extern PFN_vkCmdDrawMeshTasksIndirectCountEXT vkCmdDrawMeshTasksIndirectCountEXT;
14551458
extern PFN_vkCmdDrawMeshTasksIndirectEXT vkCmdDrawMeshTasksIndirectEXT;
14561459
#endif /* defined(VK_EXT_mesh_shader) */
1460+
#if defined(VK_EXT_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2))
1461+
extern PFN_vkCmdDrawMeshTasksIndirectCountEXT vkCmdDrawMeshTasksIndirectCountEXT;
1462+
#endif /* defined(VK_EXT_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2)) */
14571463
#if defined(VK_EXT_metal_objects)
14581464
extern PFN_vkExportMetalObjectsEXT vkExportMetalObjectsEXT;
14591465
#endif /* defined(VK_EXT_metal_objects) */
@@ -1972,10 +1978,12 @@ extern PFN_vkCmdDecompressMemoryIndirectCountNV vkCmdDecompressMemoryIndirectCou
19721978
extern PFN_vkCmdDecompressMemoryNV vkCmdDecompressMemoryNV;
19731979
#endif /* defined(VK_NV_memory_decompression) */
19741980
#if defined(VK_NV_mesh_shader)
1975-
extern PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV;
19761981
extern PFN_vkCmdDrawMeshTasksIndirectNV vkCmdDrawMeshTasksIndirectNV;
19771982
extern PFN_vkCmdDrawMeshTasksNV vkCmdDrawMeshTasksNV;
19781983
#endif /* defined(VK_NV_mesh_shader) */
1984+
#if defined(VK_NV_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2))
1985+
extern PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV;
1986+
#endif /* defined(VK_NV_mesh_shader) && (defined(VK_KHR_draw_indirect_count) || defined(VK_VERSION_1_2)) */
19791987
#if defined(VK_NV_optical_flow)
19801988
extern PFN_vkBindOpticalFlowSessionImageNV vkBindOpticalFlowSessionImageNV;
19811989
extern PFN_vkCmdOpticalFlowExecuteNV vkCmdOpticalFlowExecuteNV;

0 commit comments

Comments
 (0)