diff options
| author | 2021-07-22 20:08:01 -0400 | |
|---|---|---|
| committer | 2021-07-23 22:10:01 -0400 | |
| commit | c80ae87b4ec29903f8c65641bd7e3c6460484801 (patch) | |
| tree | 595e3aab09ac5a2ee7e5552a7b9df7c447c6f9fc /src | |
| parent | general: Rename "Frame Limit" references to "Speed Limit" (diff) | |
| download | yuzu-c80ae87b4ec29903f8c65641bd7e3c6460484801.tar.gz yuzu-c80ae87b4ec29903f8c65641bd7e3c6460484801.tar.xz yuzu-c80ae87b4ec29903f8c65641bd7e3c6460484801.zip | |
renderer_base: Removed redundant settings
use_framelimiter was not being used internally by the renderers.
set_background_color was always set to true as there is no toggle for the renderer background color, instead users directly choose the color of their choice.
Diffstat (limited to 'src')
| -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 6fe68141f..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_speed_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 c12929de6..fa1d04908 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp | |||
| @@ -332,12 +332,10 @@ void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture, | |||
| 332 | } | 332 | } |
| 333 | 333 | ||
| 334 | void RendererOpenGL::DrawScreen(const Layout::FramebufferLayout& layout) { | 334 | void RendererOpenGL::DrawScreen(const Layout::FramebufferLayout& layout) { |
| 335 | if (renderer_settings.set_background_color) { | 335 | // Update background color before drawing |
| 336 | // Update background color before drawing | 336 | glClearColor(Settings::values.bg_red.GetValue() / 255.0f, |
| 337 | glClearColor(Settings::values.bg_red.GetValue() / 255.0f, | 337 | Settings::values.bg_green.GetValue() / 255.0f, |
| 338 | Settings::values.bg_green.GetValue() / 255.0f, | 338 | Settings::values.bg_blue.GetValue() / 255.0f, 1.0f); |
| 339 | Settings::values.bg_blue.GetValue() / 255.0f, 1.0f); | ||
| 340 | } | ||
| 341 | 339 | ||
| 342 | // Set projection matrix | 340 | // Set projection matrix |
| 343 | const std::array ortho_matrix = | 341 | const std::array ortho_matrix = |