Merge branch 'issue-7-fix' of https://github.com/archshift/citra into issue-7-fix

This commit is contained in:
archshift 2014-04-30 18:37:20 -07:00
commit 04818af42e
2 changed files with 3 additions and 1 deletions

View file

@ -24,7 +24,7 @@ int __cdecl main(int argc, char **argv) {
System::Init(emu_window); System::Init(emu_window);
std::string boot_filename = "homebrew.elf"; std::string boot_filename = "/Users/gandrade-air/Downloads/homebrew/yeti3DS-master.elf";
std::string error_str; std::string error_str;
bool res = Loader::LoadFile(boot_filename, &error_str); bool res = Loader::LoadFile(boot_filename, &error_str);

View file

@ -6,6 +6,7 @@
#include "video_core/video_core.h" #include "video_core/video_core.h"
#include "video_core/renderer_opengl/renderer_opengl.h" #include "video_core/renderer_opengl/renderer_opengl.h"
#include "video_core/utils.h"
#include "core/mem_map.h" #include "core/mem_map.h"
@ -49,6 +50,7 @@ void RendererOpenGL::SwapBuffers() {
// Switch back to EFB and clear // Switch back to EFB and clear
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_fbo[kFramebuffer_EFB]); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_fbo[kFramebuffer_EFB]);
VideoCore::DumpTGA("dump.tga", 400, 240, m_xfb_top_flipped);
} }
/** /**