Merge pull request #8930 from lat9nq/disable-vulkan-check
yuzu qt: Add option to disable startup Vulkan check
This commit is contained in:
commit
12baf88dc8
|
@ -531,6 +531,7 @@ struct Values {
|
||||||
Setting<bool> use_auto_stub{false, "use_auto_stub"};
|
Setting<bool> use_auto_stub{false, "use_auto_stub"};
|
||||||
Setting<bool> enable_all_controllers{false, "enable_all_controllers"};
|
Setting<bool> enable_all_controllers{false, "enable_all_controllers"};
|
||||||
Setting<bool> create_crash_dumps{false, "create_crash_dumps"};
|
Setting<bool> create_crash_dumps{false, "create_crash_dumps"};
|
||||||
|
Setting<bool> perform_vulkan_check{true, "perform_vulkan_check"};
|
||||||
|
|
||||||
// Miscellaneous
|
// Miscellaneous
|
||||||
Setting<std::string> log_filter{"*:Info", "log_filter"};
|
Setting<std::string> log_filter{"*:Info", "log_filter"};
|
||||||
|
|
|
@ -546,6 +546,7 @@ void Config::ReadDebuggingValues() {
|
||||||
ReadBasicSetting(Settings::values.use_auto_stub);
|
ReadBasicSetting(Settings::values.use_auto_stub);
|
||||||
ReadBasicSetting(Settings::values.enable_all_controllers);
|
ReadBasicSetting(Settings::values.enable_all_controllers);
|
||||||
ReadBasicSetting(Settings::values.create_crash_dumps);
|
ReadBasicSetting(Settings::values.create_crash_dumps);
|
||||||
|
ReadBasicSetting(Settings::values.perform_vulkan_check);
|
||||||
|
|
||||||
qt_config->endGroup();
|
qt_config->endGroup();
|
||||||
}
|
}
|
||||||
|
@ -1162,6 +1163,7 @@ void Config::SaveDebuggingValues() {
|
||||||
WriteBasicSetting(Settings::values.disable_macro_jit);
|
WriteBasicSetting(Settings::values.disable_macro_jit);
|
||||||
WriteBasicSetting(Settings::values.enable_all_controllers);
|
WriteBasicSetting(Settings::values.enable_all_controllers);
|
||||||
WriteBasicSetting(Settings::values.create_crash_dumps);
|
WriteBasicSetting(Settings::values.create_crash_dumps);
|
||||||
|
WriteBasicSetting(Settings::values.perform_vulkan_check);
|
||||||
|
|
||||||
qt_config->endGroup();
|
qt_config->endGroup();
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,6 +77,7 @@ void ConfigureDebug::SetConfiguration() {
|
||||||
ui->disable_loop_safety_checks->setChecked(
|
ui->disable_loop_safety_checks->setChecked(
|
||||||
Settings::values.disable_shader_loop_safety_checks.GetValue());
|
Settings::values.disable_shader_loop_safety_checks.GetValue());
|
||||||
ui->extended_logging->setChecked(Settings::values.extended_logging.GetValue());
|
ui->extended_logging->setChecked(Settings::values.extended_logging.GetValue());
|
||||||
|
ui->perform_vulkan_check->setChecked(Settings::values.perform_vulkan_check.GetValue());
|
||||||
|
|
||||||
#ifdef YUZU_USE_QT_WEB_ENGINE
|
#ifdef YUZU_USE_QT_WEB_ENGINE
|
||||||
ui->disable_web_applet->setChecked(UISettings::values.disable_web_applet.GetValue());
|
ui->disable_web_applet->setChecked(UISettings::values.disable_web_applet.GetValue());
|
||||||
|
@ -117,6 +118,7 @@ void ConfigureDebug::ApplyConfiguration() {
|
||||||
ui->disable_loop_safety_checks->isChecked();
|
ui->disable_loop_safety_checks->isChecked();
|
||||||
Settings::values.disable_macro_jit = ui->disable_macro_jit->isChecked();
|
Settings::values.disable_macro_jit = ui->disable_macro_jit->isChecked();
|
||||||
Settings::values.extended_logging = ui->extended_logging->isChecked();
|
Settings::values.extended_logging = ui->extended_logging->isChecked();
|
||||||
|
Settings::values.perform_vulkan_check = ui->perform_vulkan_check->isChecked();
|
||||||
UISettings::values.disable_web_applet = ui->disable_web_applet->isChecked();
|
UISettings::values.disable_web_applet = ui->disable_web_applet->isChecked();
|
||||||
Debugger::ToggleConsole();
|
Debugger::ToggleConsole();
|
||||||
Common::Log::Filter filter;
|
Common::Log::Filter filter;
|
||||||
|
|
|
@ -313,6 +313,16 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="3" column="0">
|
||||||
|
<widget class="QCheckBox" name="perform_vulkan_check">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu.</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Perform Startup Vulkan Check</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
|
@ -4086,7 +4086,8 @@ int main(int argc, char* argv[]) {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (StartupChecks(argv[0], &has_broken_vulkan)) {
|
if (StartupChecks(argv[0], &has_broken_vulkan,
|
||||||
|
Settings::values.perform_vulkan_check.GetValue())) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ bool CheckEnvVars(bool* is_child) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool StartupChecks(const char* arg0, bool* has_broken_vulkan) {
|
bool StartupChecks(const char* arg0, bool* has_broken_vulkan, bool perform_vulkan_check) {
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
// Set the startup variable for child processes
|
// Set the startup variable for child processes
|
||||||
const bool env_var_set = SetEnvironmentVariableA(STARTUP_CHECK_ENV_VAR, ENV_VAR_ENABLED_TEXT);
|
const bool env_var_set = SetEnvironmentVariableA(STARTUP_CHECK_ENV_VAR, ENV_VAR_ENABLED_TEXT);
|
||||||
|
@ -67,6 +67,8 @@ bool StartupChecks(const char* arg0, bool* has_broken_vulkan) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (perform_vulkan_check) {
|
||||||
|
// Spawn child process that performs Vulkan check
|
||||||
PROCESS_INFORMATION process_info;
|
PROCESS_INFORMATION process_info;
|
||||||
std::memset(&process_info, '\0', sizeof(process_info));
|
std::memset(&process_info, '\0', sizeof(process_info));
|
||||||
|
|
||||||
|
@ -91,6 +93,7 @@ bool StartupChecks(const char* arg0, bool* has_broken_vulkan) {
|
||||||
if (CloseHandle(process_info.hThread) == 0) {
|
if (CloseHandle(process_info.hThread) == 0) {
|
||||||
std::fprintf(stderr, "CloseHandle failed with error %d\n", GetLastError());
|
std::fprintf(stderr, "CloseHandle failed with error %d\n", GetLastError());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!SetEnvironmentVariableA(STARTUP_CHECK_ENV_VAR, nullptr)) {
|
if (!SetEnvironmentVariableA(STARTUP_CHECK_ENV_VAR, nullptr)) {
|
||||||
std::fprintf(stderr, "SetEnvironmentVariableA failed to clear %s with error %d\n",
|
std::fprintf(stderr, "SetEnvironmentVariableA failed to clear %s with error %d\n",
|
||||||
|
@ -98,6 +101,7 @@ bool StartupChecks(const char* arg0, bool* has_broken_vulkan) {
|
||||||
}
|
}
|
||||||
|
|
||||||
#elif defined(YUZU_UNIX)
|
#elif defined(YUZU_UNIX)
|
||||||
|
if (perform_vulkan_check) {
|
||||||
const pid_t pid = fork();
|
const pid_t pid = fork();
|
||||||
if (pid == 0) {
|
if (pid == 0) {
|
||||||
CheckVulkan();
|
CheckVulkan();
|
||||||
|
@ -118,6 +122,7 @@ bool StartupChecks(const char* arg0, bool* has_broken_vulkan) {
|
||||||
}
|
}
|
||||||
// Vulkan is broken if the child crashed (return value is not zero)
|
// Vulkan is broken if the child crashed (return value is not zero)
|
||||||
*has_broken_vulkan = (status != 0);
|
*has_broken_vulkan = (status != 0);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ constexpr char ENV_VAR_ENABLED_TEXT[] = "ON";
|
||||||
|
|
||||||
void CheckVulkan();
|
void CheckVulkan();
|
||||||
bool CheckEnvVars(bool* is_child);
|
bool CheckEnvVars(bool* is_child);
|
||||||
bool StartupChecks(const char* arg0, bool* has_broken_vulkan);
|
bool StartupChecks(const char* arg0, bool* has_broken_vulkan, bool perform_vulkan_check);
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
bool SpawnChild(const char* arg0, PROCESS_INFORMATION* pi, int flags);
|
bool SpawnChild(const char* arg0, PROCESS_INFORMATION* pi, int flags);
|
||||||
|
|
Reference in New Issue