Browse Source
yuzu-qt: Attempt to workaround broken Vulkan installations
yuzu-qt: Attempt to workaround broken Vulkan installations
This does a few things in order to make the default setting Vulkan
workable.
- When yuzu boots, it just opens the Vulkan library.
- If it works, all good and we continue with Vulkan as the default.
- If something breaks, a new file in the config directory will be left
behind (this is deleted normally).
- If Vulkan is not working, has_broken_vulkan is set to true.
- The first time this happens, a warning is displayed to notify the
user.
- This forces use of OpenGL, and Vulkan cannot be selected.
- The Shader Backend selector is made accessible for use in custom
configurations.
- To disable has_broken_vulkan, the user needs to press a button in
Graphics Configuration to manually run the Vulkan device
enumeration.
pull/15/merge
9 changed files with 166 additions and 46 deletions
-
2src/yuzu/CMakeLists.txt
-
51src/yuzu/check_vulkan.cpp
-
1src/yuzu/check_vulkan.h
-
8src/yuzu/configuration/config.cpp
-
39src/yuzu/configuration/configure_graphics.cpp
-
2src/yuzu/configuration/configure_graphics.h
-
91src/yuzu/configuration/configure_graphics.ui
-
17src/yuzu/main.cpp
-
1src/yuzu/uisettings.h
@ -0,0 +1,51 @@ |
|||
#include "video_core/vulkan_common/vulkan_wrapper.h"
|
|||
|
|||
#include <exception>
|
|||
#include <filesystem>
|
|||
#include <fstream>
|
|||
#include "common/fs/fs.h"
|
|||
#include "common/fs/path_util.h"
|
|||
#include "common/logging/log.h"
|
|||
#include "video_core/vulkan_common/vulkan_instance.h"
|
|||
#include "video_core/vulkan_common/vulkan_library.h"
|
|||
#include "yuzu/check_vulkan.h"
|
|||
#include "yuzu/uisettings.h"
|
|||
|
|||
constexpr char TEMP_FILE_NAME[] = "vulkan_check"; |
|||
|
|||
bool CheckVulkan() { |
|||
if (UISettings::values.has_broken_vulkan) { |
|||
return true; |
|||
} |
|||
|
|||
LOG_DEBUG(Frontend, "Checking presence of Vulkan"); |
|||
|
|||
const auto fs_config_loc = Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir); |
|||
const auto temp_file_loc = fs_config_loc / TEMP_FILE_NAME; |
|||
|
|||
if (std::filesystem::exists(temp_file_loc)) { |
|||
LOG_WARNING(Frontend, "Detected recovery from previous failed Vulkan initialization"); |
|||
|
|||
UISettings::values.has_broken_vulkan = true; |
|||
std::filesystem::remove(temp_file_loc); |
|||
return false; |
|||
} |
|||
|
|||
std::ofstream temp_file_handle(temp_file_loc); |
|||
temp_file_handle.close(); |
|||
|
|||
try { |
|||
Vulkan::vk::InstanceDispatch dld; |
|||
const Common::DynamicLibrary library = Vulkan::OpenLibrary(); |
|||
const Vulkan::vk::Instance instance = |
|||
Vulkan::CreateInstance(library, dld, VK_API_VERSION_1_0); |
|||
|
|||
} catch (const Vulkan::vk::Exception& exception) { |
|||
LOG_ERROR(Frontend, "Failed to initialize Vulkan: {}", exception.what()); |
|||
UISettings::values.has_broken_vulkan = true; |
|||
return false; |
|||
} |
|||
|
|||
std::filesystem::remove(temp_file_loc); |
|||
return true; |
|||
} |
|||
@ -0,0 +1 @@ |
|||
bool CheckVulkan(); |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue