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

gsdx merge: get a new buffer for the feedback write

This commit is contained in:
Gregory Hainaut 2016-10-09 14:46:55 +02:00
parent 317a464278
commit 06055add5c
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/GSdx/GSRenderer.cpp
View File

@ -201,7 +201,9 @@ bool GSRenderer::Merge(int field)
s_n++; s_n++;
if(samesrc && fr[0].bottom == fr[1].bottom) bool feedback_merge = m_regs->EXTWRITE.WRITE == 1;
if(samesrc && fr[0].bottom == fr[1].bottom && !feedback_merge)
{ {
tex[0] = GetOutput(0, y_offset[0]); tex[0] = GetOutput(0, y_offset[0]);
tex[1] = tex[0]; // saves one texture fetch tex[1] = tex[0]; // saves one texture fetch
@ -211,6 +213,7 @@ bool GSRenderer::Merge(int field)
{ {
if(en[0]) tex[0] = GetOutput(0, y_offset[0]); if(en[0]) tex[0] = GetOutput(0, y_offset[0]);
if(en[1]) tex[1] = GetOutput(1, y_offset[1]); if(en[1]) tex[1] = GetOutput(1, y_offset[1]);
if(feedback_merge) tex[2] = GetFeedbackOutput();
} }
GSVector4 src[2]; GSVector4 src[2];

1
plugins/GSdx/GSRenderer.h
View File

@ -52,6 +52,7 @@ protected:
GSVector2i m_real_size; GSVector2i m_real_size;
virtual GSTexture* GetOutput(int i, int& y_offset) = 0; virtual GSTexture* GetOutput(int i, int& y_offset) = 0;
virtual GSTexture* GetFeedbackOutput() { return nullptr; }
public: public:
GSWnd* m_wnd; GSWnd* m_wnd;

20
plugins/GSdx/GSRendererHW.cpp
View File

@ -252,6 +252,26 @@ GSTexture* GSRendererHW::GetOutput(int i, int& y_offset)
return t; return t;
} }
GSTexture* GSRendererHW::GetFeedbackOutput()
{
GIFRegTEX0 TEX0;
TEX0.TBP0 = m_regs->EXTBUF.EXBP;
TEX0.TBW = m_regs->EXTBUF.EXBW;
TEX0.PSM = m_regs->DISP[m_regs->EXTBUF.FBIN & 1].DISPFB.PSM;
GSTextureCache::Target* rt = m_tc->LookupTarget(TEX0, m_width, m_height, /*GetFrameRect(i).bottom*/0);
GSTexture* t = rt->m_texture;
#ifdef ENABLE_OGL_DEBUG
if(s_dump && s_savef && s_n >= s_saven)
t->Save(m_dump_root + format("%05d_f%lld_fr%d_%05x_%s.bmp", s_n, m_perfmon.GetFrame(), 3, (int)TEX0.TBP0, psm_str(TEX0.PSM)));
#endif
return t;
}
void GSRendererHW::InvalidateVideoMem(const GIFRegBITBLTBUF& BITBLTBUF, const GSVector4i& r) void GSRendererHW::InvalidateVideoMem(const GIFRegBITBLTBUF& BITBLTBUF, const GSVector4i& r)
{ {
// printf("[%d] InvalidateVideoMem %d,%d - %d,%d %05x (%d)\n", (int)m_perfmon.GetFrame(), r.left, r.top, r.right, r.bottom, (int)BITBLTBUF.DBP, (int)BITBLTBUF.DPSM); // printf("[%d] InvalidateVideoMem %d,%d - %d,%d %05x (%d)\n", (int)m_perfmon.GetFrame(), r.left, r.top, r.right, r.bottom, (int)BITBLTBUF.DBP, (int)BITBLTBUF.DPSM);

1
plugins/GSdx/GSRendererHW.h
View File

@ -170,6 +170,7 @@ public:
void VSync(int field); void VSync(int field);
void ResetDevice(); void ResetDevice();
GSTexture* GetOutput(int i, int& y_offset); GSTexture* GetOutput(int i, int& y_offset);
GSTexture* GetFeedbackOutput();
void InvalidateVideoMem(const GIFRegBITBLTBUF& BITBLTBUF, const GSVector4i& r); void InvalidateVideoMem(const GIFRegBITBLTBUF& BITBLTBUF, const GSVector4i& r);
void InvalidateLocalMem(const GIFRegBITBLTBUF& BITBLTBUF, const GSVector4i& r, bool clut = false); void InvalidateLocalMem(const GIFRegBITBLTBUF& BITBLTBUF, const GSVector4i& r, bool clut = false);
void Draw(); void Draw();