diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-06-09 15:07:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-09 15:07:07 +0200 |
| commit | 8f51a9d2d8a88993167cd1c3b8d447bee1ca6407 (patch) | |
| tree | 31ea53fda80c4e7e4476cd2a16b17de89102b9c7 /Source/Core/DolphinQt/MainWindow.cpp | |
| parent | 092773ad0cd31cb0f3d111254e4e0bdb24f2c795 (diff) | |
| parent | ac48b2eea43164349e6b112604d44490a4d731c5 (diff) | |
Merge pull request #11699 from Pokechu22/gl-check-maximum-samples
OpenGL: Check the list of supported AA modes instead of hardcoding
Diffstat (limited to 'Source/Core/DolphinQt/MainWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/MainWindow.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 8262c8f01e..42a6a04603 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -343,12 +343,17 @@ MainWindow::~MainWindow() Config::Save(); } +WindowSystemInfo MainWindow::GetWindowSystemInfo() const +{ + return ::GetWindowSystemInfo(m_render_widget->windowHandle()); +} + void MainWindow::InitControllers() { if (g_controller_interface.IsInit()) return; - UICommon::InitControllers(GetWindowSystemInfo(windowHandle())); + UICommon::InitControllers(::GetWindowSystemInfo(windowHandle())); m_hotkey_scheduler = new HotkeyScheduler(); m_hotkey_scheduler->Start(); @@ -1098,7 +1103,7 @@ void MainWindow::StartGame(std::unique_ptr<BootParameters>&& parameters) // Boot up, show an error if it fails to load the game. if (!BootManager::BootCore(std::move(parameters), - GetWindowSystemInfo(m_render_widget->windowHandle()))) + ::GetWindowSystemInfo(m_render_widget->windowHandle()))) { ModalMessageBox::critical(this, tr("Error"), tr("Failed to init core"), QMessageBox::Ok); HideRenderWidget(); @@ -1206,7 +1211,7 @@ void MainWindow::HideRenderWidget(bool reinit, bool is_exit) // The controller interface will still be registered to the old render widget, if the core // has booted. Therefore, we should re-bind it to the main window for now. When the core // is next started, it will be swapped back to the new render widget. - g_controller_interface.ChangeWindow(GetWindowSystemInfo(windowHandle()).render_window, + g_controller_interface.ChangeWindow(::GetWindowSystemInfo(windowHandle()).render_window, is_exit ? ControllerInterface::WindowChangeReason::Exit : ControllerInterface::WindowChangeReason::Other); } |
