Skip to content

Commit b10c9dd

Browse files
authored
fix vulkan structure definition conflict with VK_KHR_acceleration_structure (#6205)
1 parent 8c5e23b commit b10c9dd

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/vulkan_header_fix.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,6 +1509,7 @@ typedef enum VkCooperativeVectorMatrixLayoutNV
15091509
VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_TRAINING_OPTIMAL_NV = 3,
15101510
VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_MAX_ENUM_NV = 0x7FFFFFFF
15111511
} VkCooperativeVectorMatrixLayoutNV;
1512+
#ifndef VK_KHR_acceleration_structure
15121513
typedef union VkDeviceOrHostAddressConstKHR
15131514
{
15141515
VkDeviceAddress deviceAddress;
@@ -1519,6 +1520,7 @@ typedef union VkDeviceOrHostAddressKHR
15191520
VkDeviceAddress deviceAddress;
15201521
void* hostAddress;
15211522
} VkDeviceOrHostAddressKHR;
1523+
#endif // VK_KHR_acceleration_structure
15221524
typedef struct VkPhysicalDeviceCooperativeVectorPropertiesNV
15231525
{
15241526
VkStructureType sType;

0 commit comments

Comments
 (0)