From 0f2ac928f291101bd74aac661cff7d14dfa8c984 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 1 Aug 2018 20:59:42 -0400 Subject: video_core: Make global EmuWindow instance part of the base renderer class Makes the global a member of the RendererBase class. We also change this to be a reference. Passing any form of null pointer to these functions is incorrect entirely, especially given the code itself assumes that the pointer would always be in a valid state. This also makes it easier to follow the lifecycle of instances being used, as we explicitly interact the renderer with the rasterizer, rather than it just operating on a global pointer. --- src/video_core/video_core.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/video_core/video_core.h') diff --git a/src/video_core/video_core.h b/src/video_core/video_core.h index 37da62436..8707e9881 100644 --- a/src/video_core/video_core.h +++ b/src/video_core/video_core.h @@ -18,7 +18,6 @@ namespace VideoCore { enum class Renderer { Software, OpenGL }; extern std::unique_ptr g_renderer; ///< Renderer plugin -extern EmuWindow* g_emu_window; ///< Emu window // TODO: Wrap these in a user settings struct along with any other graphics settings (often set from // qt ui) @@ -28,7 +27,7 @@ extern std::atomic g_toggle_framelimit_enabled; void Start(); /// Initialize the video core -bool Init(EmuWindow* emu_window); +bool Init(EmuWindow& emu_window); /// Shutdown the video core void Shutdown(); -- cgit v1.2.3