VERY experimental Nintendo Switch 2 emulator
C++
qt_common: Move window info function out of bootmanager
lat9nq17507c484909
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txtindex 0f8c1e6a68..2d7b9ab65f 100644--- a/src/yuzu/CMakeLists.txt+++ b/src/yuzu/CMakeLists.txt@@ -189,6 +189,8 @@ add_executable(yuzumultiplayer/state.hmultiplayer/validation.hprecompiled_headers.h+ qt_common.cpp+ qt_common.hstartup_checks.cppstartup_checks.huisettings.cppdiff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cppindex 1cf2394960..98161cc27d 100644--- a/src/yuzu/bootmanager.cpp+++ b/src/yuzu/bootmanager.cpp@@ -43,8 +43,7 @@#include "video_core/renderer_base.h"#include "yuzu/bootmanager.h"#include "yuzu/main.h"--static Core::Frontend::WindowSystemType GetWindowSystemType();+#include "yuzu/qt_common.h"EmuThread::EmuThread(Core::System& system) : m_system{system} {}@@ -233,7 +232,7 @@ public:explicit RenderWidget(GRenderWindow* parent) : QWidget(parent), render_window(parent) {setAttribute(Qt::WA_NativeWindow);setAttribute(Qt::WA_PaintOnScreen);- if (GetWindowSystemType() == Core::Frontend::WindowSystemType::Wayland) {+ if (YuzuQtCommon::GetWindowSystemType() == Core::Frontend::WindowSystemType::Wayland) {setAttribute(Qt::WA_DontCreateNativeAncestors);}}@@ -271,46 +270,6 @@ struct NullRenderWidget : public RenderWidget {explicit NullRenderWidget(GRenderWindow* parent) : RenderWidget(parent) {}};-static Core::Frontend::WindowSystemType GetWindowSystemType() {- // Determine WSI type based on Qt platform.- QString platform_name = QGuiApplication::platformName();- if (platform_name == QStringLiteral("windows"))- return Core::Frontend::WindowSystemType::Windows;- else if (platform_name == QStringLiteral("xcb"))- 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 {}!", platform_name.toStdString());- return Core::Frontend::WindowSystemType::Windows;-}--static Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow* window) {- Core::Frontend::EmuWindow::WindowSystemInfo wsi;- wsi.type = GetWindowSystemType();-- // Our Win32 Qt external doesn't have the private API.-#if defined(WIN32) || defined(__APPLE__)- wsi.render_surface = window ? reinterpret_cast<void*>(window->winId()) : nullptr;-#else- QPlatformNativeInterface* pni = QGuiApplication::platformNativeInterface();- wsi.display_connection = pni->nativeResourceForWindow("display", window);- if (wsi.type == Core::Frontend::WindowSystemType::Wayland)- wsi.render_surface = window ? pni->nativeResourceForWindow("surface", window) : nullptr;- else- wsi.render_surface = window ? reinterpret_cast<void*>(window->winId()) : nullptr;-#endif- wsi.render_surface_scale = window ? static_cast<float>(window->devicePixelRatio()) : 1.0f;-- return wsi;-}-GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_,std::shared_ptr<InputCommon::InputSubsystem> input_subsystem_,Core::System& system_)@@ -916,7 +875,7 @@ bool GRenderWindow::InitRenderTarget() {}// Update the Window System information with the new render target- window_info = GetWindowSystemInfo(child_widget->windowHandle());+ window_info = YuzuQtCommon::GetWindowSystemInfo(child_widget->windowHandle());child_widget->resize(Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height);layout()->addWidget(child_widget);diff --git a/src/yuzu/qt_common.cpp b/src/yuzu/qt_common.cppnew file mode 100644index 0000000000..1b533ee402--- /dev/null+++ b/src/yuzu/qt_common.cpp@@ -0,0 +1,55 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#include <QGuiApplication>+#include <QStringLiteral>+#include <QWindow>+#include "common/logging/log.h"+#include "core/frontend/emu_window.h"+#include "yuzu/qt_common.h"++#ifdef __linux__+#include <qpa/qplatformnativeinterface.h>+#endif++namespace YuzuQtCommon {+Core::Frontend::WindowSystemType GetWindowSystemType() {+ // Determine WSI type based on Qt platform.+ QString platform_name = QGuiApplication::platformName();+ if (platform_name == QStringLiteral("windows"))+ return Core::Frontend::WindowSystemType::Windows;+ else if (platform_name == QStringLiteral("xcb"))+ 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 {}!", platform_name.toStdString());+ return Core::Frontend::WindowSystemType::Windows;+} // namespace Core::Frontend::WindowSystemType++Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow* window) {+ Core::Frontend::EmuWindow::WindowSystemInfo wsi;+ wsi.type = GetWindowSystemType();++ // Our Win32 Qt external doesn't have the private API.+#if defined(WIN32) || defined(__APPLE__)+ wsi.render_surface = window ? reinterpret_cast<void*>(window->winId()) : nullptr;+#else+ QPlatformNativeInterface* pni = QGuiApplication::platformNativeInterface();+ wsi.display_connection = pni->nativeResourceForWindow("display", window);+ if (wsi.type == Core::Frontend::WindowSystemType::Wayland)+ wsi.render_surface = window ? pni->nativeResourceForWindow("surface", window) : nullptr;+ else+ wsi.render_surface = window ? reinterpret_cast<void*>(window->winId()) : nullptr;+#endif+ wsi.render_surface_scale = window ? static_cast<float>(window->devicePixelRatio()) : 1.0f;++ return wsi;+}+} // namespace YuzuQtCommondiff --git a/src/yuzu/qt_common.h b/src/yuzu/qt_common.hnew file mode 100644index 0000000000..b366adee69--- /dev/null+++ b/src/yuzu/qt_common.h@@ -0,0 +1,15 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#pragma once++#include <QWindow>+#include "core/frontend/emu_window.h"++namespace YuzuQtCommon {++Core::Frontend::WindowSystemType GetWindowSystemType();++Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow* window);++} // namespace YuzuQtCommon