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

Merge pull request #1693 from ssakash/framebuff 

GSDX: Pass total height of framebuffer on GetOutput()
This commit is contained in:
Gregory Hainaut 2017-01-07 13:48:35 +01:00 committed by GitHub
parent 80be9d92ca 09c72375ab
commit 648cc2bb39
6 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GSdx/GSRendererCL.cpp
View File

@ -169,7 +169,7 @@ GSTexture* GSRendererCL::GetOutput(int i, int& y_offset)
const GSRegDISPFB& DISPFB = m_regs->DISP[i].DISPFB; const GSRegDISPFB& DISPFB = m_regs->DISP[i].DISPFB;
int w = DISPFB.FBW * 64; int w = DISPFB.FBW * 64;
int h = GetFrameRect(i).height(); int h = GetFramebufferHeight();
// TODO: round up bottom // TODO: round up bottom

2
plugins/GSdx/GSRendererCS.cpp
View File

@ -345,7 +345,7 @@ GSTexture* GSRendererCS::GetOutput(int i, int& y_offset)
const GSRegDISPFB& DISPFB = m_regs->DISP[i].DISPFB; const GSRegDISPFB& DISPFB = m_regs->DISP[i].DISPFB;
int w = DISPFB.FBW * 64; int w = DISPFB.FBW * 64;
int h = GetFrameRect(i).height(); int h = GetFramebufferHeight();
// TODO: round up bottom // TODO: round up bottom

2
plugins/GSdx/GSRendererHW.cpp
View File

@ -219,7 +219,7 @@ GSTexture* GSRendererHW::GetOutput(int i, int& y_offset)
GSTexture* t = NULL; GSTexture* t = NULL;
if(GSTextureCache::Target* rt = m_tc->LookupTarget(TEX0, m_width, m_height, GetFrameRect(i).height())) if(GSTextureCache::Target* rt = m_tc->LookupTarget(TEX0, m_width, m_height, GetFramebufferHeight()))
{ {
t = rt->m_texture; t = rt->m_texture;

2
plugins/GSdx/GSRendererSW.cpp
View File

@ -165,7 +165,7 @@ GSTexture* GSRendererSW::GetOutput(int i, int& y_offset)
const GSRegDISPFB& DISPFB = m_regs->DISP[i].DISPFB; const GSRegDISPFB& DISPFB = m_regs->DISP[i].DISPFB;
int w = DISPFB.FBW * 64; int w = DISPFB.FBW * 64;
int h = GetFrameRect(i).height(); int h = GetFramebufferHeight();
// TODO: round up bottom // TODO: round up bottom

14
plugins/GSdx/GSState.cpp
View File

@ -473,6 +473,20 @@ GSVector4i GSState::GetFrameRect(int i)
return rectangle; return rectangle;
} }
int GSState::GetFramebufferHeight()
{
const GSVector4i output[2] = { GetFrameRect(0), GetFrameRect(1) };
// Framebuffer height is 11 bits max according to GS user manual
const int height_limit = (1 << 11);
int max_height = std::max(output[0].height(), output[1].height());
int frame_memory_height = std::max(max_height, output[0].runion_ordered(output[1]).height() % height_limit);
if (frame_memory_height > 1024)
GL_PERF("Massive framebuffer height detected! (height:%d)", frame_memory_height);
return frame_memory_height;
}
bool GSState::IsEnabled(int i) bool GSState::IsEnabled(int i)
{ {
ASSERT(i >= 0 && i < 2); ASSERT(i >= 0 && i < 2);

1
plugins/GSdx/GSState.h
View File

@ -242,6 +242,7 @@ public:
void ResetHandlers(); void ResetHandlers();
int GetFramebufferHeight();
GSVector4i GetDisplayRect(int i = -1, bool merged_rect = false); GSVector4i GetDisplayRect(int i = -1, bool merged_rect = false);
GSVector4i GetFrameRect(int i = -1); GSVector4i GetFrameRect(int i = -1);
GSVideoMode GetVideoMode(); GSVideoMode GetVideoMode();