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

gsdx: fix gl recording regression

This commit is contained in:
Gregory Hainaut 2016-03-21 18:52:26 +01:00
parent 8e5e770fd1
commit 205b496d5c
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GSdx/GS.cpp
View File

@ -901,7 +901,7 @@ EXPORT_C_(int) GSsetupRecording(int start, void* data)
return 0;
}
#ifdef __linux__
if (theApp.GetConfig("capture_enabled", 0)) {
if (!theApp.GetConfig("capture_enabled", 0)) {
printf("GSdx: Recording is disabled\n");
return 0;
}

18
plugins/GSdx/GSTextureOGL.cpp
View File

@ -399,9 +399,9 @@ bool GSTextureOGL::Update(const GSVector4i& r, const void* data, int pitch)
return true;
}
bool GSTextureOGL::Map(GSMap& m, const GSVector4i* r)
bool GSTextureOGL::Map(GSMap& m, const GSVector4i* _r)
{
if (!r) return false;
GSVector4i r = _r ? *_r : GSVector4i(0, 0, m_size.x, m_size.y);
// LOTS OF CRAP CODE!!!! PLEASE FIX ME !!!
if (m_type == GSTexture::Offscreen) {
@ -421,7 +421,7 @@ bool GSTextureOGL::Map(GSMap& m, const GSVector4i* r)
glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture_id, 0);
glPixelStorei(GL_PACK_ALIGNMENT, m_int_alignment);
glReadPixels(r->x, r->y, r->width(), r->height(), m_int_format, m_int_type, m_local_buffer);
glReadPixels(r.x, r.y, r.width(), r.height(), m_int_format, m_int_type, m_local_buffer);
glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
@ -437,8 +437,8 @@ bool GSTextureOGL::Map(GSMap& m, const GSVector4i* r)
m_dirty = true;
m_clean = false;
uint32 row_byte = r->width() << m_int_shift;
uint32 map_size = r->height() * row_byte;
uint32 row_byte = r.width() << m_int_shift;
uint32 map_size = r.height() * row_byte;
m.bits = (uint8*)PboPool::Map(map_size);
m.pitch = row_byte;
@ -448,10 +448,10 @@ bool GSTextureOGL::Map(GSMap& m, const GSVector4i* r)
#endif
// Save the area for the unmap
m_r_x = r->x;
m_r_y = r->y;
m_r_w = r->width();
m_r_h = r->height();
m_r_x = r.x;
m_r_y = r.y;
m_r_w = r.width();
m_r_h = r.height();
return true;
}