diff options
| author | bunnei <bunneidev@gmail.com> | 2018-01-16 17:23:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-16 17:23:33 -0500 |
| commit | 52fe15278b812a2518dd874f29c0829b221fd70f (patch) | |
| tree | 6bf8782b9338d94938e4060c8a3c88855d68ee75 /src/video_core | |
| parent | f10a7081e38419effd0ca6d6b9679310de47b867 (diff) | |
| parent | e35644c00533c797888a23420aae90b07e0da184 (diff) | |
Merge pull request #47 from MerryMage/build-fixes
Misc build fixes
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h index dd01e1b1a..db6c355a5 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.h +++ b/src/video_core/renderer_opengl/renderer_opengl.h @@ -61,7 +61,8 @@ private: // Loads framebuffer from emulated memory into the display information structure void LoadFBToScreenInfo(const FramebufferInfo& framebuffer_info, ScreenInfo& screen_info); // Fills active OpenGL texture with the given RGBA color. - void LoadColorToActiveGLTexture(u8 color_r, u8 color_g, u8 color_b, u8 color_a, const TextureInfo& texture); + void LoadColorToActiveGLTexture(u8 color_r, u8 color_g, u8 color_b, u8 color_a, + const TextureInfo& texture); EmuWindow* render_window; ///< Handle to render window |