From c63f0f37cd84d627dd40ace3205c689efc068ac0 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Sat, 25 Mar 2023 17:16:53 -0700 Subject: [PATCH] VideoCommon: Pass WindowSystemInfo to InitBackendInfo --- Source/Core/Core/Core.cpp | 4 +- .../Config/Graphics/GraphicsWindow.cpp | 4 +- .../Config/Graphics/GraphicsWindow.h | 2 + Source/Core/DolphinQt/MainWindow.cpp | 11 ++- Source/Core/DolphinQt/MainWindow.h | 2 + Source/Core/VideoBackends/D3D/D3DMain.cpp | 2 +- Source/Core/VideoBackends/D3D/VideoBackend.h | 2 +- .../Core/VideoBackends/D3D12/VideoBackend.cpp | 2 +- .../Core/VideoBackends/D3D12/VideoBackend.h | 2 +- Source/Core/VideoBackends/Metal/MTLMain.mm | 2 +- .../Core/VideoBackends/Metal/VideoBackend.h | 2 +- .../Core/VideoBackends/Null/NullBackend.cpp | 2 +- Source/Core/VideoBackends/Null/VideoBackend.h | 2 +- Source/Core/VideoBackends/OGL/OGLMain.cpp | 68 +++++++++++-------- Source/Core/VideoBackends/OGL/VideoBackend.h | 4 +- Source/Core/VideoBackends/Software/SWmain.cpp | 2 +- .../VideoBackends/Software/VideoBackend.h | 2 +- Source/Core/VideoBackends/Vulkan/VKMain.cpp | 2 +- .../Core/VideoBackends/Vulkan/VideoBackend.h | 2 +- Source/Core/VideoCommon/VideoBackendBase.cpp | 8 +-- Source/Core/VideoCommon/VideoBackendBase.h | 6 +- 21 files changed, 76 insertions(+), 57 deletions(-) diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index fb97379411..dbcca8a687 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -261,7 +261,7 @@ bool Init(std::unique_ptr boot, const WindowSystemInfo& wsi) Host_UpdateMainFrame(); // Disable any menus or buttons at boot // Manually reactivate the video backend in case a GameINI overrides the video backend setting. - VideoBackendBase::PopulateBackendInfo(); + VideoBackendBase::PopulateBackendInfo(wsi); // Issue any API calls which must occur on the main thread for the graphics backend. WindowSystemInfo prepared_wsi(wsi); @@ -579,7 +579,7 @@ static void EmuThread(std::unique_ptr boot, WindowSystemInfo wsi system.GetPowerPC().GetDebugInterface().Clear(guard); }}; - VideoBackendBase::PopulateBackendInfo(); + VideoBackendBase::PopulateBackendInfo(wsi); if (!g_video_backend->Initialize(wsi)) { diff --git a/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp index 535458685c..7b31cc7f6e 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp @@ -24,7 +24,7 @@ #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" -GraphicsWindow::GraphicsWindow(MainWindow* parent) : QDialog(parent) +GraphicsWindow::GraphicsWindow(MainWindow* parent) : QDialog(parent), m_main_window(parent) { CreateMainLayout(); @@ -68,7 +68,7 @@ void GraphicsWindow::CreateMainLayout() void GraphicsWindow::OnBackendChanged(const QString& backend_name) { Config::SetBase(Config::MAIN_GFX_BACKEND, backend_name.toStdString()); - VideoBackendBase::PopulateBackendInfoFromUI(); + VideoBackendBase::PopulateBackendInfoFromUI(m_main_window->GetWindowSystemInfo()); setWindowTitle( tr("%1 Graphics Configuration").arg(tr(g_video_backend->GetDisplayName().c_str()))); diff --git a/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.h b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.h index c345de3fef..5949a2dda3 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.h +++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.h @@ -28,4 +28,6 @@ signals: private: void CreateMainLayout(); void OnBackendChanged(const QString& backend); + + MainWindow* const m_main_window; }; 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&& 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); } diff --git a/Source/Core/DolphinQt/MainWindow.h b/Source/Core/DolphinQt/MainWindow.h index fa3a274bfc..4654202ed7 100644 --- a/Source/Core/DolphinQt/MainWindow.h +++ b/Source/Core/DolphinQt/MainWindow.h @@ -50,6 +50,7 @@ class ThreadWidget; class ToolBar; class WatchWidget; class WiiTASInputWindow; +struct WindowSystemInfo; namespace DiscIO { @@ -76,6 +77,7 @@ public: ~MainWindow(); void Show(); + WindowSystemInfo GetWindowSystemInfo() const; bool eventFilter(QObject* object, QEvent* event) override; diff --git a/Source/Core/VideoBackends/D3D/D3DMain.cpp b/Source/Core/VideoBackends/D3D/D3DMain.cpp index 8256674ad5..4f797fcb26 100644 --- a/Source/Core/VideoBackends/D3D/D3DMain.cpp +++ b/Source/Core/VideoBackends/D3D/D3DMain.cpp @@ -63,7 +63,7 @@ std::optional VideoBackend::GetWarningMessage() const return result; } -void VideoBackend::InitBackendInfo() +void VideoBackend::InitBackendInfo(const WindowSystemInfo& wsi) { if (!D3DCommon::LoadLibraries()) return; diff --git a/Source/Core/VideoBackends/D3D/VideoBackend.h b/Source/Core/VideoBackends/D3D/VideoBackend.h index 1349d13b2b..6a94f8c7a3 100644 --- a/Source/Core/VideoBackends/D3D/VideoBackend.h +++ b/Source/Core/VideoBackends/D3D/VideoBackend.h @@ -18,7 +18,7 @@ public: std::string GetDisplayName() const override; std::optional GetWarningMessage() const override; - void InitBackendInfo() override; + void InitBackendInfo(const WindowSystemInfo& wsi) override; static constexpr const char* NAME = "D3D"; diff --git a/Source/Core/VideoBackends/D3D12/VideoBackend.cpp b/Source/Core/VideoBackends/D3D12/VideoBackend.cpp index afc5bb96e8..f82b7d961b 100644 --- a/Source/Core/VideoBackends/D3D12/VideoBackend.cpp +++ b/Source/Core/VideoBackends/D3D12/VideoBackend.cpp @@ -36,7 +36,7 @@ std::string VideoBackend::GetDisplayName() const return "Direct3D 12"; } -void VideoBackend::InitBackendInfo() +void VideoBackend::InitBackendInfo(const WindowSystemInfo& wsi) { if (!D3DCommon::LoadLibraries()) return; diff --git a/Source/Core/VideoBackends/D3D12/VideoBackend.h b/Source/Core/VideoBackends/D3D12/VideoBackend.h index 7d3126b38c..db03b738d0 100644 --- a/Source/Core/VideoBackends/D3D12/VideoBackend.h +++ b/Source/Core/VideoBackends/D3D12/VideoBackend.h @@ -16,7 +16,7 @@ public: std::string GetName() const override; std::string GetDisplayName() const override; - void InitBackendInfo() override; + void InitBackendInfo(const WindowSystemInfo& wsi) override; static constexpr const char* NAME = "D3D12"; diff --git a/Source/Core/VideoBackends/Metal/MTLMain.mm b/Source/Core/VideoBackends/Metal/MTLMain.mm index f799d5eea1..7042e091fd 100644 --- a/Source/Core/VideoBackends/Metal/MTLMain.mm +++ b/Source/Core/VideoBackends/Metal/MTLMain.mm @@ -119,7 +119,7 @@ void Metal::VideoBackend::Shutdown() ObjectCache::Shutdown(); } -void Metal::VideoBackend::InitBackendInfo() +void Metal::VideoBackend::InitBackendInfo(const WindowSystemInfo& wsi) { @autoreleasepool { diff --git a/Source/Core/VideoBackends/Metal/VideoBackend.h b/Source/Core/VideoBackends/Metal/VideoBackend.h index 3a567718e2..a6a24173e5 100644 --- a/Source/Core/VideoBackends/Metal/VideoBackend.h +++ b/Source/Core/VideoBackends/Metal/VideoBackend.h @@ -18,7 +18,7 @@ public: std::string GetDisplayName() const override; std::optional GetWarningMessage() const override; - void InitBackendInfo() override; + void InitBackendInfo(const WindowSystemInfo& wsi) override; void PrepareWindow(WindowSystemInfo& wsi) override; diff --git a/Source/Core/VideoBackends/Null/NullBackend.cpp b/Source/Core/VideoBackends/Null/NullBackend.cpp index 900a911699..28afcce4dc 100644 --- a/Source/Core/VideoBackends/Null/NullBackend.cpp +++ b/Source/Core/VideoBackends/Null/NullBackend.cpp @@ -25,7 +25,7 @@ namespace Null { -void VideoBackend::InitBackendInfo() +void VideoBackend::InitBackendInfo(const WindowSystemInfo& wsi) { g_Config.backend_info.api_type = APIType::Nothing; g_Config.backend_info.MaxTextureSize = 16384; diff --git a/Source/Core/VideoBackends/Null/VideoBackend.h b/Source/Core/VideoBackends/Null/VideoBackend.h index f08098cfd0..4437c0c48d 100644 --- a/Source/Core/VideoBackends/Null/VideoBackend.h +++ b/Source/Core/VideoBackends/Null/VideoBackend.h @@ -15,7 +15,7 @@ public: std::string GetName() const override { return NAME; } std::string GetDisplayName() const override; - void InitBackendInfo() override; + void InitBackendInfo(const WindowSystemInfo& wsi) override; static constexpr const char* NAME = "Null"; }; diff --git a/Source/Core/VideoBackends/OGL/OGLMain.cpp b/Source/Core/VideoBackends/OGL/OGLMain.cpp index c47b94ceb8..ef25e40a2a 100644 --- a/Source/Core/VideoBackends/OGL/OGLMain.cpp +++ b/Source/Core/VideoBackends/OGL/OGLMain.cpp @@ -74,8 +74,45 @@ std::string VideoBackend::GetDisplayName() const return _trans("OpenGL"); } -void VideoBackend::InitBackendInfo() +void VideoBackend::InitBackendInfo(const WindowSystemInfo& wsi) { + std::unique_ptr temp_gl_context = + GLContext::Create(wsi, g_Config.stereo_mode == StereoMode::QuadBuffer, true, false, + Config::Get(Config::GFX_PREFER_GLES)); + + if (!temp_gl_context) + return; + + FillBackendInfo(temp_gl_context.get()); +} + +bool VideoBackend::InitializeGLExtensions(GLContext* context) +{ + // Init extension support. + if (!GLExtensions::Init(context)) + { + // OpenGL 2.0 is required for all shader based drawings. There is no way to get this by + // extensions + PanicAlertFmtT("GPU: OGL ERROR: Does your video card support OpenGL 2.0?"); + return false; + } + + if (GLExtensions::Version() < 300) + { + // integer vertex attributes require a gl3 only function + PanicAlertFmtT("GPU: OGL ERROR: Need OpenGL version 3.\n" + "GPU: Does your video card support OpenGL 3?"); + return false; + } + + return true; +} + +bool VideoBackend::FillBackendInfo(GLContext* context) +{ + if (!InitializeGLExtensions(context)) + return false; + g_Config.backend_info.api_type = APIType::OpenGL; g_Config.backend_info.MaxTextureSize = 16384; g_Config.backend_info.bUsesLowerLeftOrigin = true; @@ -123,33 +160,6 @@ void VideoBackend::InitBackendInfo() // aamodes - 1 is to stay consistent with D3D (means no AA) g_Config.backend_info.AAModes = {1, 2, 4, 8}; -} - -bool VideoBackend::InitializeGLExtensions(GLContext* context) -{ - // Init extension support. - if (!GLExtensions::Init(context)) - { - // OpenGL 2.0 is required for all shader based drawings. There is no way to get this by - // extensions - PanicAlertFmtT("GPU: OGL ERROR: Does your video card support OpenGL 2.0?"); - return false; - } - - if (GLExtensions::Version() < 300) - { - // integer vertex attributes require a gl3 only function - PanicAlertFmtT("GPU: OGL ERROR: Need OpenGL version 3.\n" - "GPU: Does your video card support OpenGL 3?"); - return false; - } - - return true; -} - -bool VideoBackend::FillBackendInfo() -{ - InitBackendInfo(); // check for the max vertex attributes GLint numvertexattribs = 0; @@ -184,7 +194,7 @@ bool VideoBackend::Initialize(const WindowSystemInfo& wsi) if (!main_gl_context) return false; - if (!InitializeGLExtensions(main_gl_context.get()) || !FillBackendInfo()) + if (!FillBackendInfo(main_gl_context.get())) return false; auto gfx = std::make_unique(std::move(main_gl_context), wsi.render_surface_scale); diff --git a/Source/Core/VideoBackends/OGL/VideoBackend.h b/Source/Core/VideoBackends/OGL/VideoBackend.h index 4be861954e..53f7f940d5 100644 --- a/Source/Core/VideoBackends/OGL/VideoBackend.h +++ b/Source/Core/VideoBackends/OGL/VideoBackend.h @@ -19,12 +19,12 @@ public: std::string GetName() const override; std::string GetDisplayName() const override; - void InitBackendInfo() override; + void InitBackendInfo(const WindowSystemInfo& wsi) override; static constexpr const char* NAME = "OGL"; private: bool InitializeGLExtensions(GLContext* context); - bool FillBackendInfo(); + bool FillBackendInfo(GLContext* context); }; } // namespace OGL diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 8703ea4b4d..ccb040e8ad 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -62,7 +62,7 @@ std::optional VideoSoftware::GetWarningMessage() const "really want to enable software rendering? If unsure, select 'No'."); } -void VideoSoftware::InitBackendInfo() +void VideoSoftware::InitBackendInfo(const WindowSystemInfo& wsi) { g_Config.backend_info.api_type = APIType::Nothing; g_Config.backend_info.MaxTextureSize = 16384; diff --git a/Source/Core/VideoBackends/Software/VideoBackend.h b/Source/Core/VideoBackends/Software/VideoBackend.h index 8c3cb081ef..35c3adb1a7 100644 --- a/Source/Core/VideoBackends/Software/VideoBackend.h +++ b/Source/Core/VideoBackends/Software/VideoBackend.h @@ -17,7 +17,7 @@ class VideoSoftware : public VideoBackendBase std::string GetDisplayName() const override; std::optional GetWarningMessage() const override; - void InitBackendInfo() override; + void InitBackendInfo(const WindowSystemInfo& wsi) override; static constexpr const char* NAME = "Software Renderer"; }; diff --git a/Source/Core/VideoBackends/Vulkan/VKMain.cpp b/Source/Core/VideoBackends/Vulkan/VKMain.cpp index 053b592c14..2eb9b34106 100644 --- a/Source/Core/VideoBackends/Vulkan/VKMain.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKMain.cpp @@ -30,7 +30,7 @@ namespace Vulkan { -void VideoBackend::InitBackendInfo() +void VideoBackend::InitBackendInfo(const WindowSystemInfo& wsi) { VulkanContext::PopulateBackendInfo(&g_Config); diff --git a/Source/Core/VideoBackends/Vulkan/VideoBackend.h b/Source/Core/VideoBackends/Vulkan/VideoBackend.h index a16d149307..4e8c3a5471 100644 --- a/Source/Core/VideoBackends/Vulkan/VideoBackend.h +++ b/Source/Core/VideoBackends/Vulkan/VideoBackend.h @@ -16,7 +16,7 @@ public: std::string GetName() const override { return NAME; } std::string GetDisplayName() const override { return _trans("Vulkan"); } - void InitBackendInfo() override; + void InitBackendInfo(const WindowSystemInfo& wsi) override; void PrepareWindow(WindowSystemInfo& wsi) override; static constexpr const char* NAME = "Vulkan"; diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp index 9d6ff70664..6e466c8557 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.cpp +++ b/Source/Core/VideoCommon/VideoBackendBase.cpp @@ -281,7 +281,7 @@ void VideoBackendBase::ActivateBackend(const std::string& name) g_video_backend = iter->get(); } -void VideoBackendBase::PopulateBackendInfo() +void VideoBackendBase::PopulateBackendInfo(const WindowSystemInfo& wsi) { g_Config.Refresh(); // Reset backend_info so if the backend forgets to initialize something it doesn't end up using @@ -289,18 +289,18 @@ void VideoBackendBase::PopulateBackendInfo() g_Config.backend_info = {}; ActivateBackend(Config::Get(Config::MAIN_GFX_BACKEND)); g_Config.backend_info.DisplayName = g_video_backend->GetDisplayName(); - g_video_backend->InitBackendInfo(); + g_video_backend->InitBackendInfo(wsi); // We validate the config after initializing the backend info, as system-specific settings // such as anti-aliasing, or the selected adapter may be invalid, and should be checked. g_Config.VerifyValidity(); } -void VideoBackendBase::PopulateBackendInfoFromUI() +void VideoBackendBase::PopulateBackendInfoFromUI(const WindowSystemInfo& wsi) { // If the core is running, the backend info will have been populated already. // If we did it here, the UI thread can race with the with the GPU thread. if (!Core::IsRunning()) - PopulateBackendInfo(); + PopulateBackendInfo(wsi); } void VideoBackendBase::DoState(PointerWrap& p) diff --git a/Source/Core/VideoCommon/VideoBackendBase.h b/Source/Core/VideoCommon/VideoBackendBase.h index 2ce235f8f8..f5222a1936 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.h +++ b/Source/Core/VideoCommon/VideoBackendBase.h @@ -47,7 +47,7 @@ public: virtual std::string GetName() const = 0; virtual std::string GetDisplayName() const { return GetName(); } - virtual void InitBackendInfo() = 0; + virtual void InitBackendInfo(const WindowSystemInfo& wsi) = 0; virtual std::optional GetWarningMessage() const { return {}; } // Prepares a native window for rendering. This is called on the main thread, or the @@ -69,9 +69,9 @@ public: static void ActivateBackend(const std::string& name); // Fills the backend_info fields with the capabilities of the selected backend/device. - static void PopulateBackendInfo(); + static void PopulateBackendInfo(const WindowSystemInfo& wsi); // Called by the UI thread when the graphics config is opened. - static void PopulateBackendInfoFromUI(); + static void PopulateBackendInfoFromUI(const WindowSystemInfo& wsi); // Wrapper function which pushes the event to the GPU thread. void DoState(PointerWrap& p);