summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar archshift2014-04-30 18:37:20 -0700
committerGravatar archshift2014-04-30 18:37:20 -0700
commit04818af42eea23662fd8602f85d0867bf5a95508 (patch)
tree68cba2f446072d9df9f0e16b6266161c8bd7109f /src
parentUnintended change reversal (diff)
parentTGA dumps work, courtesy of @bunnei (diff)
downloadyuzu-04818af42eea23662fd8602f85d0867bf5a95508.tar.gz
yuzu-04818af42eea23662fd8602f85d0867bf5a95508.tar.xz
yuzu-04818af42eea23662fd8602f85d0867bf5a95508.zip
Merge branch 'issue-7-fix' of https://github.com/archshift/citra into issue-7-fix
Diffstat (limited to 'src')
-rw-r--r--src/citra/citra.cpp2
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index d55b97393..458695ca7 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -24,7 +24,7 @@ int __cdecl main(int argc, char **argv) {
24 24
25 System::Init(emu_window); 25 System::Init(emu_window);
26 26
27 std::string boot_filename = "homebrew.elf"; 27 std::string boot_filename = "/Users/gandrade-air/Downloads/homebrew/yeti3DS-master.elf";
28 std::string error_str; 28 std::string error_str;
29 29
30 bool res = Loader::LoadFile(boot_filename, &error_str); 30 bool res = Loader::LoadFile(boot_filename, &error_str);
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index 314b1a8ed..5407c483a 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -6,6 +6,7 @@
6 6
7#include "video_core/video_core.h" 7#include "video_core/video_core.h"
8#include "video_core/renderer_opengl/renderer_opengl.h" 8#include "video_core/renderer_opengl/renderer_opengl.h"
9#include "video_core/utils.h"
9 10
10#include "core/mem_map.h" 11#include "core/mem_map.h"
11 12
@@ -49,6 +50,7 @@ void RendererOpenGL::SwapBuffers() {
49 50
50 // Switch back to EFB and clear 51 // Switch back to EFB and clear
51 glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_fbo[kFramebuffer_EFB]); 52 glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_fbo[kFramebuffer_EFB]);
53 VideoCore::DumpTGA("dump.tga", 400, 240, m_xfb_top_flipped);
52} 54}
53 55
54/** 56/**