rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-05 01:24:14 +01:00
Code Issues Projects Releases Wiki Activity

[vulkan] Try loading winevulkan.dll before vulkan-1.dll

Browse Source 
Should bypass issues with third-party overlays trying to hook Vulkan.
This commit is contained in:
Philip Rebohle 2023-01-18 17:18:10 +01:00
parent c6668ffbaa
commit 4d0d455895
2 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/vulkan/vulkan_loader.cpp
View File

@ -1,24 +1,48 @@
#include <tuple>
#include "vulkan_loader.h"
#include "../util/log/log.h"
#include "../util/util_string.h"
#include "../util/util_win32_compat.h"
namespace dxvk::vk {
static HMODULE loadVulkanLibrary() {
static std::pair<HMODULE, PFN_vkGetInstanceProcAddr> loadVulkanLibrary() {
static const std::array<const char*, 2> dllNames = {{
#ifdef _WIN32
return LoadLibraryA("vulkan-1.dll");
"winevulkan.dll",
"vulkan-1.dll",
#else
HMODULE library = LoadLibraryA("libvulkan.so");
if (!library)
library = LoadLibraryA("libvulkan.so.1");
return library;
"libvulkan.so",
"libvulkan.so.1",
#endif
}};
for (auto dllName : dllNames) {
HMODULE library = LoadLibraryA(dllName);
if (!library)
continue;
auto proc = GetProcAddress(library, "vkGetInstanceProcAddr");
if (!proc) {
FreeLibrary(library);
continue;
}
Logger::info(str::format("Vulkan: Found vkGetInstanceProcAddr in ", dllName, " @ 0x", std::hex, reinterpret_cast<uintptr_t>(proc)));
return std::make_pair(library, reinterpret_cast<PFN_vkGetInstanceProcAddr>(proc));
}
Logger::err("Vulkan: vkGetInstanceProcAddr not found");
return { };
}
LibraryLoader::LibraryLoader()
: m_library(loadVulkanLibrary())
, m_getInstanceProcAddr(reinterpret_cast<PFN_vkGetInstanceProcAddr>(
GetProcAddress(m_library, "vkGetInstanceProcAddr"))) {
LibraryLoader::LibraryLoader() {
std::tie(m_library, m_getInstanceProcAddr) = loadVulkanLibrary();
}
LibraryLoader::~LibraryLoader() {

4
src/vulkan/vulkan_loader.h
View File

@ -26,8 +26,8 @@ namespace dxvk::vk {
PFN_vkGetInstanceProcAddr getLoaderProc() const { return m_getInstanceProcAddr; }
bool valid() const;
protected:
const HMODULE m_library;
const PFN_vkGetInstanceProcAddr m_getInstanceProcAddr;
HMODULE m_library = nullptr;
PFN_vkGetInstanceProcAddr m_getInstanceProcAddr = nullptr;
};