The open source OpenXR runtime
aux/vk: check EXT_debug_utils loaded function before enabling support
Co-authored-by: Rylie Pavlik <rylie.pavlik@collabora.com>
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2332>
authored by
Simon Zeni
Rylie Pavlik
and committed by
Rylie Pavlik
a944cfdc
cef70d03
+12
-6
+12
-6
src/xrt/auxiliary/vk/vk_bundle_init.c
+12
-6
src/xrt/auxiliary/vk/vk_bundle_init.c
···
1446
1446
}
1447
1447
#endif
1448
1448
1449
-
#ifdef VK_EXT_debug_utils
1450
-
if (debug_utils_enabled) {
1451
-
vk->has_EXT_debug_utils = true;
1452
-
}
1453
-
#endif
1454
-
1455
1449
// Fill in the device features we are interested in.
1456
1450
fill_in_device_features(vk);
1457
1451
···
1466
1460
1467
1461
vk->vkGetDeviceQueue(vk->device, vk->queue_family_index, vk->queue_index, &vk->queue);
1468
1462
1463
+
vk->has_EXT_debug_utils = false;
1464
+
if (debug_utils_enabled) {
1465
+
#ifdef VK_EXT_debug_utils
1466
+
if (vk->vkSetDebugUtilsObjectNameEXT) {
1467
+
vk->has_EXT_debug_utils = true;
1468
+
} else {
1469
+
VK_WARN(vk, "EXT_debug_utils requested but extension is not loaded");
1470
+
}
1471
+
#else
1472
+
VK_WARN(vk, "EXT_debug_utils requested but extension was not available at compile time");
1473
+
#endif
1474
+
}
1469
1475
1470
1476
return VK_SUCCESS;
1471
1477