phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-23 07:40:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Make this compatible to build with MSVS 2022

Browse source
This commit is contained in:
kittnz 2026-02-23 16:30:49 +01:00
parent 590131590c
commit 9dd15ef922
9 changed files with 201 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/core/window.cpp
View file

@ -2,6 +2,9 @@
#include "core/logger.hpp"
#include "rendering/vk_context.hpp"
#include <SDL2/SDL_vulkan.h>
#ifdef _WIN32
#include <cstdlib>
#endif
namespace wowee {
namespace core {
@ -29,6 +32,33 @@ bool Window::initialize() {
return false;
}
// Explicitly load the Vulkan library before creating the window.
// SDL_CreateWindow with SDL_WINDOW_VULKAN fails on some platforms/drivers
// if the Vulkan loader hasn't been located yet; calling this first gives a
// clear error and avoids the misleading "not configured in SDL" message.
// SDL 2.28+ uses LoadLibraryExW(LOAD_LIBRARY_SEARCH_DEFAULT_DIRS) which does
// not search System32, so fall back to the explicit path on Windows if needed.
bool vulkanLoaded = (SDL_Vulkan_LoadLibrary(nullptr) == 0);
#ifdef _WIN32
if (!vulkanLoaded) {
const char* sysRoot = std::getenv("SystemRoot");
if (sysRoot && *sysRoot) {
std::string fallbackPath = std::string(sysRoot) + "\\System32\\vulkan-1.dll";
vulkanLoaded = (SDL_Vulkan_LoadLibrary(fallbackPath.c_str()) == 0);
if (vulkanLoaded) {
LOG_INFO("Loaded Vulkan library via explicit path: ", fallbackPath);
}
}
}
#endif
if (!vulkanLoaded) {
LOG_ERROR("Failed to load Vulkan library: ", SDL_GetError());
LOG_ERROR("Ensure the Vulkan runtime (vulkan-1.dll) is installed. "
"Install the latest GPU drivers or the Vulkan Runtime from https://vulkan.lunarg.com/");
SDL_Quit();
return false;
}
// Create Vulkan window (no GL attributes needed)
Uint32 flags = SDL_WINDOW_VULKAN | SDL_WINDOW_SHOWN;
if (config.fullscreen) {
@ -74,6 +104,7 @@ void Window::shutdown() {
window = nullptr;
}
SDL_Vulkan_UnloadLibrary();
SDL_Quit();
LOG_INFO("Window shutdown complete");
}