From b0f79f78a5fb88b59e5834d9199e94e1cc15efcd Mon Sep 17 00:00:00 2001 From: Sasha Szpakowski Date: Sun, 8 Jan 2023 15:21:26 -0400 Subject: [PATCH] vulkan: don't pass a SDL_Window into GetInstanceExtensions, it's unneeded. --- src/modules/graphics/vulkan/Graphics.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/modules/graphics/vulkan/Graphics.cpp b/src/modules/graphics/vulkan/Graphics.cpp index e48a8b3e4..768d4056e 100644 --- a/src/modules/graphics/vulkan/Graphics.cpp +++ b/src/modules/graphics/vulkan/Graphics.cpp @@ -1264,11 +1264,10 @@ void Graphics::createVulkanInstance() createInfo.pApplicationInfo = &appInfo; createInfo.pNext = nullptr; - auto window = Module::getInstance(M_WINDOW); - const void *handle = window->getHandle(); - + // GetInstanceExtensions works with a null window parameter as long as + // SDL_Vulkan_LoadLibrary has been called (which we do earlier). unsigned int count; - if (SDL_Vulkan_GetInstanceExtensions((SDL_Window*)handle, &count, nullptr) != SDL_TRUE) + if (SDL_Vulkan_GetInstanceExtensions(nullptr, &count, nullptr) != SDL_TRUE) throw love::Exception("couldn't retrieve sdl vulkan extensions"); std::vector extensions = {}; @@ -1281,7 +1280,7 @@ void Graphics::createVulkanInstance() size_t additional_extension_count = extensions.size(); extensions.resize(additional_extension_count + count); - if (SDL_Vulkan_GetInstanceExtensions((SDL_Window*)handle, &count, extensions.data() + additional_extension_count) != SDL_TRUE) + if (SDL_Vulkan_GetInstanceExtensions(nullptr, &count, extensions.data() + additional_extension_count) != SDL_TRUE) throw love::Exception("couldn't retrieve sdl vulkan extensions"); createInfo.enabledExtensionCount = static_cast(extensions.size());