diff options
author | bunnei <ericbunnie@gmail.com> | 2014-04-18 23:52:49 +0200 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-04-18 23:52:49 +0200 |
commit | 958bca606e80110e05d7c142dda3097fddc96503 (patch) | |
tree | 576917751444b4dfdb476d040b4e075bde431b7b /src/video_core | |
parent | Init window size from VideoCore. Start changing the default window behavior... (diff) | |
parent | renamed hw_lcd module to just lcd (diff) | |
download | yuzu-958bca606e80110e05d7c142dda3097fddc96503.tar yuzu-958bca606e80110e05d7c142dda3097fddc96503.tar.gz yuzu-958bca606e80110e05d7c142dda3097fddc96503.tar.bz2 yuzu-958bca606e80110e05d7c142dda3097fddc96503.tar.lz yuzu-958bca606e80110e05d7c142dda3097fddc96503.tar.xz yuzu-958bca606e80110e05d7c142dda3097fddc96503.tar.zst yuzu-958bca606e80110e05d7c142dda3097fddc96503.zip |
Diffstat (limited to 'src/video_core')
-rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 8 | ||||
-rw-r--r-- | src/video_core/video_core.cpp | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 97f84c248..35804aee1 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "core/hw/lcd.h" + #include "video_core/video_core.h" #include "video_core/renderer_opengl/renderer_opengl.h" @@ -75,8 +77,8 @@ void RendererOpenGL::FlipFramebuffer(u32 addr, u8* out) { */ void RendererOpenGL::RenderXFB(const Rect& src_rect, const Rect& dst_rect) { - FlipFramebuffer(0x20282160, m_xfb_top_flipped); - FlipFramebuffer(0x202118E0, m_xfb_bottom_flipped); + FlipFramebuffer(LCD::TOP_RIGHT_FRAME1, m_xfb_top_flipped); + FlipFramebuffer(LCD::SUB_FRAME1, m_xfb_bottom_flipped); // Blit the top framebuffer // ------------------------ @@ -84,7 +86,7 @@ void RendererOpenGL::RenderXFB(const Rect& src_rect, const Rect& dst_rect) { // Update textures with contents of XFB in RAM - top glBindTexture(GL_TEXTURE_2D, m_xfb_texture_top); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight, - GL_RGB, GL_UNSIGNED_BYTE, m_xfb_top_flipped); + GL_BGR, GL_UNSIGNED_BYTE, m_xfb_top_flipped); glBindTexture(GL_TEXTURE_2D, 0); // Render target is destination framebuffer diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index e227b6795..f2e17f9f9 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp @@ -38,12 +38,13 @@ void Init(EmuWindow* emu_window) { g_current_frame = 0; - NOTICE_LOG(VIDEO, "initialized ok"); + NOTICE_LOG(VIDEO, "initialized OK"); } /// Shutdown the video core void Shutdown() { delete g_renderer; + NOTICE_LOG(VIDEO, "shutdown OK"); } } // namespace |