Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-06-08 12:01:39 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix instance-extension iteration

Browse source 
Add the extensions when they are available rather than statically
including them.
This commit is contained in:
Wunkolo 2023-08-11 18:40:47 -07:00
parent 6dcd09af3e
commit 27268f86d3
1 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/core/renderer_vk/renderer_vk.cpp
View file

@ -587,12 +587,30 @@ void RendererVK::initGraphicsContext(SDL_Window* window) {
instanceInfo.pApplicationInfo = &applicationInfo; instanceInfo.pApplicationInfo = &applicationInfo;
std::vector<const char*> instanceExtensions = { std::unordered_set<std::string> instanceExtensionsAvailable = {};
if (const auto enumerateResult = vk::enumerateInstanceExtensionProperties(); enumerateResult.result == vk::Result::eSuccess) {
for (const auto& curExtension : enumerateResult.value) {
instanceExtensionsAvailable.emplace(curExtension.extensionName);
}
}
std::vector<const char*> instanceExtensions = {};
if (instanceExtensionsAvailable.contains(VK_KHR_SURFACE_EXTENSION_NAME)) {
instanceExtensions.emplace_back(VK_KHR_SURFACE_EXTENSION_NAME);
}
bool debugUtils = false;
if (instanceExtensionsAvailable.contains(VK_EXT_DEBUG_UTILS_EXTENSION_NAME)) {
instanceExtensions.emplace_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
debugUtils = true;
}
#if defined(__APPLE__) #if defined(__APPLE__)
VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME, if (instanceExtensionsAvailable.contains(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME)) {
instanceExtensionNames.emplace_back(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME);
}
#endif #endif
VK_EXT_DEBUG_UTILS_EXTENSION_NAME,
};
// Get any additional extensions that SDL wants as well // Get any additional extensions that SDL wants as well
if (targetWindow) { if (targetWindow) {
@ -620,13 +638,7 @@ void RendererVK::initGraphicsContext(SDL_Window* window) {
VULKAN_HPP_DEFAULT_DISPATCHER.init(instance.get()); VULKAN_HPP_DEFAULT_DISPATCHER.init(instance.get());
// Enable debug messenger if the instance was able to be created with debug_utils // Enable debug messenger if the instance was able to be created with debug_utils
if (std::find( if (debugUtils) {
instanceExtensions.begin(), instanceExtensions.end(),
// std::string_view has a way to compare itself to `const char*`
// so by casting it, we get the actual string comparisons
// and not pointer-comparisons
std::string_view(VK_EXT_DEBUG_UTILS_EXTENSION_NAME)
) != instanceExtensions.end()) {
vk::DebugUtilsMessengerCreateInfoEXT debugCreateInfo{}; vk::DebugUtilsMessengerCreateInfoEXT debugCreateInfo{};
debugCreateInfo.messageSeverity = vk::DebugUtilsMessageSeverityFlagBitsEXT::eVerbose | vk::DebugUtilsMessageSeverityFlagBitsEXT::eInfo | debugCreateInfo.messageSeverity = vk::DebugUtilsMessageSeverityFlagBitsEXT::eVerbose | vk::DebugUtilsMessageSeverityFlagBitsEXT::eInfo |
vk::DebugUtilsMessageSeverityFlagBitsEXT::eError | vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning; vk::DebugUtilsMessageSeverityFlagBitsEXT::eError | vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning;