diff options
| author |  bunnei | 2019-02-12 21:40:31 -0500 |
|---|---|---|
| committer |  GitHub | 2019-02-12 21:40:31 -0500 |
| commit | c425a1a857c8833dbc18e81d7b03386ac8749fbc (patch) | |
| tree | 94383cce27f061741ee651451cfefc6ade3978de /src | |
| parent | Merge pull request #2110 from lioncash/namespace (diff) | |
| parent | renderer_opengl: Remove reference to global system instance (diff) | |
| download | yuzu-c425a1a857c8833dbc18e81d7b03386ac8749fbc.tar.gz yuzu-c425a1a857c8833dbc18e81d7b03386ac8749fbc.tar.xz yuzu-c425a1a857c8833dbc18e81d7b03386ac8749fbc.zip | |
Merge pull request #2114 from lioncash/global
renderer_opengl: Remove reference to global system instance
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 843c034e7..cca2ed708 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp | |||
| @@ -107,7 +107,7 @@ RendererOpenGL::~RendererOpenGL() = default; | |||
| 107 | void RendererOpenGL::SwapBuffers( | 107 | void RendererOpenGL::SwapBuffers( |
| 108 | std::optional<std::reference_wrapper<const Tegra::FramebufferConfig>> framebuffer) { | 108 | std::optional<std::reference_wrapper<const Tegra::FramebufferConfig>> framebuffer) { |
| 109 | 109 | ||
| 110 | Core::System::GetInstance().GetPerfStats().EndSystemFrame(); | 110 | system.GetPerfStats().EndSystemFrame(); |
| 111 | 111 | ||
| 112 | // Maintain the rasterizer's state as a priority | 112 | // Maintain the rasterizer's state as a priority |
| 113 | OpenGLState prev_state = OpenGLState::GetCurState(); | 113 | OpenGLState prev_state = OpenGLState::GetCurState(); |
| @@ -137,8 +137,8 @@ void RendererOpenGL::SwapBuffers( | |||
| 137 | 137 | ||
| 138 | render_window.PollEvents(); | 138 | render_window.PollEvents(); |
| 139 | 139 | ||
| 140 | Core::System::GetInstance().FrameLimiter().DoFrameLimiting(Core::Timing::GetGlobalTimeUs()); | 140 | system.FrameLimiter().DoFrameLimiting(Core::Timing::GetGlobalTimeUs()); |
| 141 | Core::System::GetInstance().GetPerfStats().BeginSystemFrame(); | 141 | system.GetPerfStats().BeginSystemFrame(); |
| 142 | 142 | ||
| 143 | // Restore the rasterizer state | 143 | // Restore the rasterizer state |
| 144 | prev_state.Apply(); | 144 | prev_state.Apply(); |