ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for latest commit : turns out Destroy() already frees the data, also add sskkiipp's offset patch for the "dump frames" 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3900 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
sl1nk3.s 2009-07-29 00:49:12 +00:00
parent caf152fdd0
commit 7995cd2d13
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
View File

@ -917,10 +917,10 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight)
s_criticalScreenshot.Enter(); s_criticalScreenshot.Enter();
int w = xfbSource->sourceRc.GetWidth(); int w = xfbSource->sourceRc.GetWidth();
int h = xfbSource->sourceRc.GetHeight(); int h = xfbSource->sourceRc.GetHeight();
int t = yOffset;
u8 *data = (u8 *) malloc(3 * w * h); u8 *data = (u8 *) malloc(3 * w * h);
glPixelStorei(GL_PACK_ALIGNMENT, 1); glPixelStorei(GL_PACK_ALIGNMENT, 1);
glReadPixels(0, t, w, h, GL_BGR, GL_UNSIGNED_BYTE, data); glReadPixels(0, Renderer::GetTargetHeight() - h + yOffset, w, h, GL_BGR, GL_UNSIGNED_BYTE, data);
if (glGetError() == GL_NO_ERROR) if (glGetError() == GL_NO_ERROR)
{ {
if (!s_bLastFrameDumped) if (!s_bLastFrameDumped)
@ -967,7 +967,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight)
int h = OpenGL_GetBackbufferHeight(); int h = OpenGL_GetBackbufferHeight();
u8 *data = (u8 *) malloc(3 * w * h); u8 *data = (u8 *) malloc(3 * w * h);
glPixelStorei(GL_PACK_ALIGNMENT, 1); glPixelStorei(GL_PACK_ALIGNMENT, 1);
glReadPixels(0, 0, w, h, GL_RGB, GL_UNSIGNED_BYTE, data); glReadPixels(0, Renderer::GetTargetHeight() - h, w, h, GL_RGB, GL_UNSIGNED_BYTE, data);
if (glGetError() == GL_NO_ERROR) { if (glGetError() == GL_NO_ERROR) {
if (!s_bLastFrameDumped) { if (!s_bLastFrameDumped) {
sprintf(movie_file_name, "%s/framedump.raw", FULL_FRAMES_DIR); sprintf(movie_file_name, "%s/framedump.raw", FULL_FRAMES_DIR);
@ -1333,9 +1333,8 @@ bool Renderer::SaveRenderTarget(const char *filename, int W, int H, int YOffset)
a.Destroy(); a.Destroy();
#else #else
bool result = SaveTGA(filename, W, H, data); bool result = SaveTGA(filename, W, H, data);
#endif
// Do not forget to release the data...
free(data); free(data);
#endif
return result; return result;
} }