diff options
| author | 2018-08-31 11:31:20 -0400 | |
|---|---|---|
| committer | 2018-08-31 11:31:20 -0400 | |
| commit | f08d24e9c0a8dd7920ca5db5a5765b867eb1d714 (patch) | |
| tree | f2b144f08f5881d4e1174d9eb0184cf6548f20ce /src/video_core | |
| parent | Merge pull request #1207 from degasus/hotfix (diff) | |
| parent | core: Make the main System class use the PImpl idiom (diff) | |
| download | yuzu-f08d24e9c0a8dd7920ca5db5a5765b867eb1d714.tar.gz yuzu-f08d24e9c0a8dd7920ca5db5a5765b867eb1d714.tar.xz yuzu-f08d24e9c0a8dd7920ca5db5a5765b867eb1d714.zip | |
Merge pull request #1204 from lioncash/pimpl
core: Make the main System class use the PImpl idiom
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 73d6419b4..3c4a9f17c 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include "core/core_timing.h" | 14 | #include "core/core_timing.h" |
| 15 | #include "core/frontend/emu_window.h" | 15 | #include "core/frontend/emu_window.h" |
| 16 | #include "core/memory.h" | 16 | #include "core/memory.h" |
| 17 | #include "core/perf_stats.h" | ||
| 17 | #include "core/settings.h" | 18 | #include "core/settings.h" |
| 18 | #include "core/tracer/recorder.h" | 19 | #include "core/tracer/recorder.h" |
| 19 | #include "video_core/renderer_opengl/gl_rasterizer.h" | 20 | #include "video_core/renderer_opengl/gl_rasterizer.h" |
| @@ -115,7 +116,7 @@ RendererOpenGL::~RendererOpenGL() = default; | |||
| 115 | void RendererOpenGL::SwapBuffers(boost::optional<const Tegra::FramebufferConfig&> framebuffer) { | 116 | void RendererOpenGL::SwapBuffers(boost::optional<const Tegra::FramebufferConfig&> framebuffer) { |
| 116 | ScopeAcquireGLContext acquire_context{render_window}; | 117 | ScopeAcquireGLContext acquire_context{render_window}; |
| 117 | 118 | ||
| 118 | Core::System::GetInstance().perf_stats.EndSystemFrame(); | 119 | Core::System::GetInstance().GetPerfStats().EndSystemFrame(); |
| 119 | 120 | ||
| 120 | // Maintain the rasterizer's state as a priority | 121 | // Maintain the rasterizer's state as a priority |
| 121 | OpenGLState prev_state = OpenGLState::GetCurState(); | 122 | OpenGLState prev_state = OpenGLState::GetCurState(); |
| @@ -140,8 +141,8 @@ void RendererOpenGL::SwapBuffers(boost::optional<const Tegra::FramebufferConfig& | |||
| 140 | 141 | ||
| 141 | render_window.PollEvents(); | 142 | render_window.PollEvents(); |
| 142 | 143 | ||
| 143 | Core::System::GetInstance().frame_limiter.DoFrameLimiting(CoreTiming::GetGlobalTimeUs()); | 144 | Core::System::GetInstance().FrameLimiter().DoFrameLimiting(CoreTiming::GetGlobalTimeUs()); |
| 144 | Core::System::GetInstance().perf_stats.BeginSystemFrame(); | 145 | Core::System::GetInstance().GetPerfStats().BeginSystemFrame(); |
| 145 | 146 | ||
| 146 | // Restore the rasterizer state | 147 | // Restore the rasterizer state |
| 147 | prev_state.Apply(); | 148 | prev_state.Apply(); |