diff options
| author | Liam <byteslice@airmail.cc> | 2022-12-16 14:47:22 +0100 |
|---|---|---|
| committer | Liam <byteslice@airmail.cc> | 2022-12-16 14:47:22 +0100 |
| commit | b81caf1879125ecf63b8d43b4b87850e90ead71d (patch) | |
| tree | a4cb4a6bf70929cb2170d5472b10911dfc759a6c | |
| parent | Merge pull request #9431 from liamwhite/sixty-five-oh-two (diff) | |
| download | yuzu-b81caf1879125ecf63b8d43b4b87850e90ead71d.tar yuzu-b81caf1879125ecf63b8d43b4b87850e90ead71d.tar.gz yuzu-b81caf1879125ecf63b8d43b4b87850e90ead71d.tar.bz2 yuzu-b81caf1879125ecf63b8d43b4b87850e90ead71d.tar.lz yuzu-b81caf1879125ecf63b8d43b4b87850e90ead71d.tar.xz yuzu-b81caf1879125ecf63b8d43b4b87850e90ead71d.tar.zst yuzu-b81caf1879125ecf63b8d43b4b87850e90ead71d.zip | |
| -rw-r--r-- | src/yuzu/bootmanager.cpp | 7 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 1a47fb9c9..7c8922841 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -269,12 +269,14 @@ static Core::Frontend::WindowSystemType GetWindowSystemType() { return Core::Frontend::WindowSystemType::X11; else if (platform_name == QStringLiteral("wayland")) return Core::Frontend::WindowSystemType::Wayland; + else if (platform_name == QStringLiteral("wayland-egl")) + return Core::Frontend::WindowSystemType::Wayland; else if (platform_name == QStringLiteral("cocoa")) return Core::Frontend::WindowSystemType::Cocoa; else if (platform_name == QStringLiteral("android")) return Core::Frontend::WindowSystemType::Android; - LOG_CRITICAL(Frontend, "Unknown Qt platform!"); + LOG_CRITICAL(Frontend, "Unknown Qt platform {}!", platform_name.toStdString()); return Core::Frontend::WindowSystemType::Windows; } @@ -314,7 +316,8 @@ GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_, input_subsystem->Initialize(); this->setMouseTracking(true); - strict_context_required = QGuiApplication::platformName() == QStringLiteral("wayland"); + strict_context_required = QGuiApplication::platformName() == QStringLiteral("wayland") || + QGuiApplication::platformName() == QStringLiteral("wayland-egl"); connect(this, &GRenderWindow::FirstFrameDisplayed, parent, &GMainWindow::OnLoadComplete); connect(this, &GRenderWindow::ExecuteProgramSignal, parent, &GMainWindow::OnExecuteProgram, diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 885e24990..e68b4f799 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -2917,7 +2917,8 @@ static QScreen* GuessCurrentScreen(QWidget* window) { bool GMainWindow::UsingExclusiveFullscreen() { return Settings::values.fullscreen_mode.GetValue() == Settings::FullscreenMode::Exclusive || - QGuiApplication::platformName() == QStringLiteral("wayland"); + QGuiApplication::platformName() == QStringLiteral("wayland") || + QGuiApplication::platformName() == QStringLiteral("wayland-egl"); } void GMainWindow::ShowFullscreen() { |