diff options
| author | 2021-07-26 18:51:00 -0700 | |
|---|---|---|
| committer | 2021-07-26 18:51:00 -0700 | |
| commit | d6c799494c6235bc0796386bb31cae9fbe26f737 (patch) | |
| tree | ba4d1992e822cb8c0b2744e838ea503df97dde1f /src/video_core | |
| parent | Merge pull request #6741 from ReinUsesLisp/stream-remove (diff) | |
| parent | renderer_base: Removed redundant settings (diff) | |
| download | yuzu-d6c799494c6235bc0796386bb31cae9fbe26f737.tar.gz yuzu-d6c799494c6235bc0796386bb31cae9fbe26f737.tar.xz yuzu-d6c799494c6235bc0796386bb31cae9fbe26f737.zip | |
Merge pull request #6696 from ameerj/speed-limit-rename
general: Rename "Frame Limit" references to "Speed Limit"
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/renderer_base.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/renderer_base.h | 3 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 10 |
3 files changed, 4 insertions, 12 deletions
diff --git a/src/video_core/renderer_base.cpp b/src/video_core/renderer_base.cpp index c9a360aaf..3ea72fda9 100644 --- a/src/video_core/renderer_base.cpp +++ b/src/video_core/renderer_base.cpp | |||
| @@ -19,9 +19,6 @@ RendererBase::~RendererBase() = default; | |||
| 19 | 19 | ||
| 20 | void RendererBase::RefreshBaseSettings() { | 20 | void RendererBase::RefreshBaseSettings() { |
| 21 | UpdateCurrentFramebufferLayout(); | 21 | UpdateCurrentFramebufferLayout(); |
| 22 | |||
| 23 | renderer_settings.use_framelimiter = Settings::values.use_frame_limit.GetValue(); | ||
| 24 | renderer_settings.set_background_color = true; | ||
| 25 | } | 22 | } |
| 26 | 23 | ||
| 27 | void RendererBase::UpdateCurrentFramebufferLayout() { | 24 | void RendererBase::UpdateCurrentFramebufferLayout() { |
diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h index 63d8ad42a..22b80c328 100644 --- a/src/video_core/renderer_base.h +++ b/src/video_core/renderer_base.h | |||
| @@ -21,9 +21,6 @@ class GraphicsContext; | |||
| 21 | namespace VideoCore { | 21 | namespace VideoCore { |
| 22 | 22 | ||
| 23 | struct RendererSettings { | 23 | struct RendererSettings { |
| 24 | std::atomic_bool use_framelimiter{false}; | ||
| 25 | std::atomic_bool set_background_color{false}; | ||
| 26 | |||
| 27 | // Screenshot | 24 | // Screenshot |
| 28 | std::atomic<bool> screenshot_requested{false}; | 25 | std::atomic<bool> screenshot_requested{false}; |
| 29 | void* screenshot_bits{}; | 26 | void* screenshot_bits{}; |
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 285e78384..f1b00c24c 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp | |||
| @@ -328,12 +328,10 @@ void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture, | |||
| 328 | } | 328 | } |
| 329 | 329 | ||
| 330 | void RendererOpenGL::DrawScreen(const Layout::FramebufferLayout& layout) { | 330 | void RendererOpenGL::DrawScreen(const Layout::FramebufferLayout& layout) { |
| 331 | if (renderer_settings.set_background_color) { | 331 | // Update background color before drawing |
| 332 | // Update background color before drawing | 332 | glClearColor(Settings::values.bg_red.GetValue() / 255.0f, |
| 333 | glClearColor(Settings::values.bg_red.GetValue() / 255.0f, | 333 | Settings::values.bg_green.GetValue() / 255.0f, |
| 334 | Settings::values.bg_green.GetValue() / 255.0f, | 334 | Settings::values.bg_blue.GetValue() / 255.0f, 1.0f); |
| 335 | Settings::values.bg_blue.GetValue() / 255.0f, 1.0f); | ||
| 336 | } | ||
| 337 | 335 | ||
| 338 | // Set projection matrix | 336 | // Set projection matrix |
| 339 | const std::array ortho_matrix = | 337 | const std::array ortho_matrix = |