summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/yuzu/bootmanager.cpp7
-rw-r--r--src/yuzu/main.cpp3
2 files changed, 7 insertions, 3 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index 6afbdaf12..896208596 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -274,12 +274,14 @@ static Core::Frontend::WindowSystemType GetWindowSystemType() {
274 return Core::Frontend::WindowSystemType::X11; 274 return Core::Frontend::WindowSystemType::X11;
275 else if (platform_name == QStringLiteral("wayland")) 275 else if (platform_name == QStringLiteral("wayland"))
276 return Core::Frontend::WindowSystemType::Wayland; 276 return Core::Frontend::WindowSystemType::Wayland;
277 else if (platform_name == QStringLiteral("wayland-egl"))
278 return Core::Frontend::WindowSystemType::Wayland;
277 else if (platform_name == QStringLiteral("cocoa")) 279 else if (platform_name == QStringLiteral("cocoa"))
278 return Core::Frontend::WindowSystemType::Cocoa; 280 return Core::Frontend::WindowSystemType::Cocoa;
279 else if (platform_name == QStringLiteral("android")) 281 else if (platform_name == QStringLiteral("android"))
280 return Core::Frontend::WindowSystemType::Android; 282 return Core::Frontend::WindowSystemType::Android;
281 283
282 LOG_CRITICAL(Frontend, "Unknown Qt platform!"); 284 LOG_CRITICAL(Frontend, "Unknown Qt platform {}!", platform_name.toStdString());
283 return Core::Frontend::WindowSystemType::Windows; 285 return Core::Frontend::WindowSystemType::Windows;
284} 286}
285 287
@@ -319,7 +321,8 @@ GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_,
319 input_subsystem->Initialize(); 321 input_subsystem->Initialize();
320 this->setMouseTracking(true); 322 this->setMouseTracking(true);
321 323
322 strict_context_required = QGuiApplication::platformName() == QStringLiteral("wayland"); 324 strict_context_required = QGuiApplication::platformName() == QStringLiteral("wayland") ||
325 QGuiApplication::platformName() == QStringLiteral("wayland-egl");
323 326
324 connect(this, &GRenderWindow::FirstFrameDisplayed, parent, &GMainWindow::OnLoadComplete); 327 connect(this, &GRenderWindow::FirstFrameDisplayed, parent, &GMainWindow::OnLoadComplete);
325 connect(this, &GRenderWindow::ExecuteProgramSignal, parent, &GMainWindow::OnExecuteProgram, 328 connect(this, &GRenderWindow::ExecuteProgramSignal, parent, &GMainWindow::OnExecuteProgram,
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 70552bdb8..2e6c2311a 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -3067,7 +3067,8 @@ static QScreen* GuessCurrentScreen(QWidget* window) {
3067 3067
3068bool GMainWindow::UsingExclusiveFullscreen() { 3068bool GMainWindow::UsingExclusiveFullscreen() {
3069 return Settings::values.fullscreen_mode.GetValue() == Settings::FullscreenMode::Exclusive || 3069 return Settings::values.fullscreen_mode.GetValue() == Settings::FullscreenMode::Exclusive ||
3070 QGuiApplication::platformName() == QStringLiteral("wayland"); 3070 QGuiApplication::platformName() == QStringLiteral("wayland") ||
3071 QGuiApplication::platformName() == QStringLiteral("wayland-egl");
3071} 3072}
3072 3073
3073void GMainWindow::ShowFullscreen() { 3074void GMainWindow::ShowFullscreen() {