Skip to content

Commit 02a2fde

Browse files
committed
cubepp: Remove deprecated constructor usage
Switch pfnUserCallback from PFN_vkDebugUtilsMessengerCallbackEXT to vk::PFN_DebugUtilsMessengerCallbackEXT
1 parent 5763a62 commit 02a2fde

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

cube/cube.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,10 @@ struct Demo {
347347
bool memory_type_from_properties(uint32_t typeBits, vk::MemoryPropertyFlags requirements_mask, uint32_t &typeIndex);
348348
vk::SurfaceFormatKHR pick_surface_format(const std::vector<vk::SurfaceFormatKHR> &surface_formats);
349349

350-
static VKAPI_ATTR VkBool32 VKAPI_CALL debug_messenger_callback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
351-
VkDebugUtilsMessageTypeFlagsEXT messageType,
352-
const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData,
353-
void *pUserData);
350+
static VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_messenger_callback(vk::DebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
351+
vk::DebugUtilsMessageTypeFlagsEXT messageType,
352+
const vk::DebugUtilsMessengerCallbackDataEXT *pCallbackData,
353+
void *pUserData);
354354

355355
#if defined(VK_USE_PLATFORM_WIN32_KHR)
356356
void run();
@@ -1353,10 +1353,10 @@ int find_display_gpu(int gpu_number, const std::vector<vk::PhysicalDevice> &phys
13531353
return -1;
13541354
}
13551355
#endif
1356-
VKAPI_ATTR VkBool32 VKAPI_CALL Demo::debug_messenger_callback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
1357-
VkDebugUtilsMessageTypeFlagsEXT messageType,
1358-
const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData,
1359-
void *pUserData) {
1356+
VKAPI_ATTR vk::Bool32 VKAPI_CALL Demo::debug_messenger_callback(vk::DebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
1357+
vk::DebugUtilsMessageTypeFlagsEXT messageType,
1358+
const vk::DebugUtilsMessengerCallbackDataEXT *pCallbackData,
1359+
void *pUserData) {
13601360
std::ostringstream message;
13611361
Demo &demo = *static_cast<Demo *>(pUserData);
13621362

@@ -1385,9 +1385,9 @@ VKAPI_ATTR VkBool32 VKAPI_CALL Demo::debug_messenger_callback(VkDebugUtilsMessag
13851385
<< vk::to_string(vk::ObjectType(pCallbackData->pObjects[object].objectType)) << ", Handle ";
13861386

13871387
// Print handle correctly if it is a dispatchable handle - aka a pointer
1388-
VkObjectType t = pCallbackData->pObjects[object].objectType;
1389-
if (t == VK_OBJECT_TYPE_INSTANCE || t == VK_OBJECT_TYPE_PHYSICAL_DEVICE || t == VK_OBJECT_TYPE_DEVICE ||
1390-
t == VK_OBJECT_TYPE_COMMAND_BUFFER || t == VK_OBJECT_TYPE_QUEUE) {
1388+
vk::ObjectType t = pCallbackData->pObjects[object].objectType;
1389+
if (t == vk::ObjectType::eInstance || t == vk::ObjectType::ePhysicalDevice || t == vk::ObjectType::eDevice ||
1390+
t == vk::ObjectType::eCommandBuffer || t == vk::ObjectType::eQueue) {
13911391
message << reinterpret_cast<void *>(static_cast<uintptr_t>(pCallbackData->pObjects[object].objectHandle));
13921392
} else {
13931393
message << pCallbackData->pObjects[object].objectHandle;

0 commit comments

Comments
 (0)