From d4411acfd04a5c585e7cb8aebcc2e3260f9ee17f Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 16 Apr 2014 21:30:10 -0400 Subject: removed hard-coded framebuffer addresses from renderer_opengl.cpp --- src/video_core/renderer_opengl/renderer_opengl.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/video_core/renderer_opengl') diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 97f84c248..6cac968ed 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/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 // ------------------------ -- cgit v1.2.3 From 9d5a561c1b611bf5e501e8b67f0e9670c42adb19 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 17 Apr 2014 17:47:34 -0400 Subject: fixed framebuffer color order --- src/video_core/renderer_opengl/renderer_opengl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/video_core/renderer_opengl') diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 6cac968ed..168de9253 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -86,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 -- cgit v1.2.3 From 70c2cce963264678b5ba5b6aa17c2653bf459e61 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 17 Apr 2014 23:48:23 -0400 Subject: renamed hw_lcd module to just lcd --- src/video_core/renderer_opengl/renderer_opengl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/video_core/renderer_opengl') diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 168de9253..35804aee1 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "core/hw/hw_lcd.h" +#include "core/hw/lcd.h" #include "video_core/video_core.h" #include "video_core/renderer_opengl/renderer_opengl.h" -- cgit v1.2.3