eden-emu/Vulkan-Utility-Libraries
14
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git synced 2025-05-15 09:18:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better declare GetObjectType()'s lack of 32 bit support

Browse source 
Create a new default specialization for 32 bit which indicates to the
user that the GetObjectType() helper does not work in 32 bit builds.
This commit is contained in:
Charles Giessen 2024-06-27 10:43:03 -05:00 • committed by Charles Giessen
parent ef99ad5203
commit 144ce1b3c1
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/vulkan/utility/vk_struct_helper.hpp
View file

@ -1038,13 +1038,12 @@ class InitStructHelper {
return InitStruct<T>(p_next); return InitStruct<T>(p_next);
} }
}; };
#if VK_USE_64_BIT_PTR_DEFINES == 1
template<typename T> VkObjectType GetObjectType() { template<typename T> VkObjectType GetObjectType() {
static_assert(sizeof(T) == 0, "GetObjectType() is being used with an unsupported Type! Is the code-gen up to date?"); static_assert(sizeof(T) == 0, "GetObjectType() is being used with an unsupported Type! Is the code-gen up to date?");
return VK_OBJECT_TYPE_UNKNOWN; return VK_OBJECT_TYPE_UNKNOWN;
} }
#if VK_USE_64_BIT_PTR_DEFINES == 1
template<> inline VkObjectType GetObjectType<VkBuffer>() { return VK_OBJECT_TYPE_BUFFER; } template<> inline VkObjectType GetObjectType<VkBuffer>() { return VK_OBJECT_TYPE_BUFFER; }
template<> inline VkObjectType GetObjectType<VkImage>() { return VK_OBJECT_TYPE_IMAGE; } template<> inline VkObjectType GetObjectType<VkImage>() { return VK_OBJECT_TYPE_IMAGE; }
template<> inline VkObjectType GetObjectType<VkInstance>() { return VK_OBJECT_TYPE_INSTANCE; } template<> inline VkObjectType GetObjectType<VkInstance>() { return VK_OBJECT_TYPE_INSTANCE; }
@ -1098,7 +1097,12 @@ template<> inline VkObjectType GetObjectType<VkMicromapEXT>() { return VK_OBJECT
template<> inline VkObjectType GetObjectType<VkOpticalFlowSessionNV>() { return VK_OBJECT_TYPE_OPTICAL_FLOW_SESSION_NV; } template<> inline VkObjectType GetObjectType<VkOpticalFlowSessionNV>() { return VK_OBJECT_TYPE_OPTICAL_FLOW_SESSION_NV; }
template<> inline VkObjectType GetObjectType<VkShaderEXT>() { return VK_OBJECT_TYPE_SHADER_EXT; } template<> inline VkObjectType GetObjectType<VkShaderEXT>() { return VK_OBJECT_TYPE_SHADER_EXT; }
#endif // VK_USE_64_BIT_PTR_DEFINES == 1 # else // 32 bit
template<typename T> VkObjectType GetObjectType() {
static_assert(sizeof(T) == 0, "GetObjectType() does not support 32 bit builds! This is a limitation of the vulkan.h headers");
return VK_OBJECT_TYPE_UNKNOWN;
}
# endif // VK_USE_64_BIT_PTR_DEFINES == 1
} // namespace vku } // namespace vku
// NOLINTEND// clang-format on // NOLINTEND// clang-format on

10
scripts/generators/struct_helper_generator.py
View file

@ -123,20 +123,24 @@ class InitStructHelper {
return InitStruct<T>(p_next); return InitStruct<T>(p_next);
} }
}; };
#if VK_USE_64_BIT_PTR_DEFINES == 1
template<typename T> VkObjectType GetObjectType() { template<typename T> VkObjectType GetObjectType() {
static_assert(sizeof(T) == 0, "GetObjectType() is being used with an unsupported Type! Is the code-gen up to date?"); static_assert(sizeof(T) == 0, "GetObjectType() is being used with an unsupported Type! Is the code-gen up to date?");
return VK_OBJECT_TYPE_UNKNOWN; return VK_OBJECT_TYPE_UNKNOWN;
} }
#if VK_USE_64_BIT_PTR_DEFINES == 1
''') ''')
for handle in self.vk.handles.values(): for handle in self.vk.handles.values():
out.extend(guard_helper.add_guard(handle.protect)) out.extend(guard_helper.add_guard(handle.protect))
out.append(f'template<> inline VkObjectType GetObjectType<{handle.name}>() {{ return {handle.type}; }}\n') out.append(f'template<> inline VkObjectType GetObjectType<{handle.name}>() {{ return {handle.type}; }}\n')
out.extend(guard_helper.add_guard(None)) out.extend(guard_helper.add_guard(None))
out.append(''' out.append('''
#endif // VK_USE_64_BIT_PTR_DEFINES == 1 # else // 32 bit
template<typename T> VkObjectType GetObjectType() {
static_assert(sizeof(T) == 0, "GetObjectType() does not support 32 bit builds! This is a limitation of the vulkan.h headers");
return VK_OBJECT_TYPE_UNKNOWN;
}
# endif // VK_USE_64_BIT_PTR_DEFINES == 1
} // namespace vku } // namespace vku
\n''') \n''')