diff options
| author |  bunnei <bunneidev@gmail.com> | 2015-04-04 15:14:14 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-04-04 15:14:14 -0400 |
| commit | 64196976b91e4202504724d65c1c772e1c542c39 (patch) | |
| tree | 153bae22824e049686724c0c4e630e3a71f979e2 /src/video_core | |
| parent | 3fd2cc566b38d34c587140ce3dbc580f85e34717 (diff) | |
| parent | cae89fb315afb4dfd83d9e33298505a58ecb7a08 (diff) | |
Merge pull request #680 from archshift/bg-color
Allow the user to set the background clear color during emulation
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 4273a177..5e864b75 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -6,6 +6,7 @@ #include "core/hw/hw.h" #include "core/hw/lcd.h" #include "core/mem_map.h" +#include "core/settings.h" #include "common/emu_window.h" #include "common/profiler_reporting.h" @@ -172,7 +173,7 @@ void RendererOpenGL::LoadColorToActiveGLTexture(u8 color_r, u8 color_g, u8 color * Initializes the OpenGL state and creates persistent objects. */ void RendererOpenGL::InitOpenGLObjects() { - glClearColor(1.0f, 1.0f, 1.0f, 0.0f); + glClearColor(Settings::values.bg_red, Settings::values.bg_green, Settings::values.bg_blue, 0.0f); glDisable(GL_DEPTH_TEST); // Link shaders and get variable locations |