octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video_core: Make global EmuWindow instance part of the base renderer …

Browse Source 
…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.
This commit is contained in:
fearlessTobi
2018-08-24 15:18:46 +02:00
parent b49d042200
commit f61c9c3eb7
14 changed files with 49 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/video_core/video_core.cpp
View File

@ -14,7 +14,6 @@
namespace VideoCore {
EmuWindow* g_emu_window = nullptr; ///< Frontend emulator window
std::unique_ptr<RendererBase> g_renderer; ///< Renderer plugin
std::atomic<bool> g_hw_renderer_enabled;
@ -25,12 +24,10 @@ std::atomic<bool> g_hw_shader_accurate_mul;
std::atomic<bool> g_renderer_bg_color_update_requested;
/// Initialize the video core
Core::System::ResultStatus Init(EmuWindow* emu_window) {
Core::System::ResultStatus Init(EmuWindow& emu_window) {
Pica::Init();
g_emu_window = emu_window;
g_renderer = std::make_unique<RendererOpenGL>();
g_renderer->SetWindow(g_emu_window);
g_renderer = std::make_unique<RendererOpenGL>(emu_window);
Core::System::ResultStatus result = g_renderer->Init();
if (result != Core::System::ResultStatus::Success) {