piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

XFB in SC reverted back to its previous behavior (thx donko). But still hacked in DC (still a FIXME).

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2019 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
memberTwo.mb2
2009-01-27 20:59:27 +00:00
parent 52deb12599
commit ac80c04eab
7 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp
View File

@ -442,13 +442,17 @@ void BPWritten(int addr, int changes, int newval)
// the number of lines copied is determined by the y scale * source efb height
float yScale = bpmem.dispcopyyscale / 256.0f;
float xfbLines = bpmem.copyTexSrcWH.y + 1.0f * yScale;
//XFB_Write(Memory_GetPtr(bpmem.copyTexDest << 5), multirc, (bpmem.copyMipMapStrideChannels << 4), (int)xfbLines);
// TODO: compact this below if everyone is happy with it
u8* pXFB = Memory_GetPtr(bpmem.copyTexDest << 5);
u32 dstWidth = (bpmem.copyMipMapStrideChannels << 4);
u32 dstHeight = (u32)xfbLines;
XFB_Write(pXFB, multirc, dstWidth, dstHeight);
XFB_Draw(pXFB, dstWidth, dstHeight, 0);
// FIXME: we draw XFB from here in DC mode.
// Bad hack since we can have multiple EFB to XFB copy before a draw.
// Plus we should use width and height from VI regs (see VI->Update()).
// Dixit donkopunchstania for the info.
//DebugLog("(EFB to XFB->XFB_Draw): ptr: %08x | %ix%i", (u32)pXFB, dstWidth, dstHeight);
if (g_VideoInitialize.bUseDualCore)
XFB_Draw(pXFB, dstWidth, dstHeight, 0);
}
else
{

12
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View File

@ -360,22 +360,24 @@ unsigned int Video_Screenshot(TCHAR* _szFilename)
return FALSE;
}
void Video_UpdateXFB(u8* _pXFB, u32 _dwWidth, u32 _dwHeight, s32 _dwYOffset, bool scheduling)
{
if(g_Config.bUseXFB && XFB_isInit())
{
if (scheduling) // DC mode
if (scheduling) // from CPU in DC without fifo&CP (some 2D homebrews)
{
XFB_SetUpdateArgs(_pXFB, _dwWidth, _dwHeight, _dwYOffset);
g_XFBUpdateRequested = TRUE;
}
else // SC mode or DC without fifo&CP
else
{
if (_pXFB) // from CPU
if (_pXFB) // from CPU in SC mode
XFB_Draw(_pXFB, _dwWidth, _dwHeight, _dwYOffset);
else // from GP
else // from GP in DC without fifo&CP (some 2D homebrews)
{
XFB_Draw();
g_XFBUpdateRequested = FALSE;
}
}
}
}