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

Don't use events for efb access. As I've learned, events cause kernel calls and it is sometimes more efficient to do spin-waits. See if this speeds up Wind Waker's pictobox quests. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3893 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Nolan Check 2009-07-27 22:05:38 +00:00
parent 6a92924636
commit 8027ab53d0
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Src/Atomic_Win32.h
View File

@ -55,7 +55,7 @@ inline u32 AtomicLoad(volatile u32& src) {
} }
inline u32 AtomicLoadAcquire(volatile u32& src) { inline u32 AtomicLoadAcquire(volatile u32& src) {
MemoryBarrier(); MemoryBarrier();
return src; return src; // 32-bit reads are always atomic.
} }
inline void AtomicStore(volatile u32& dest, u32 value) { inline void AtomicStore(volatile u32& dest, u32 value) {

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

@ -104,11 +104,8 @@ int GLScissorX, GLScissorY, GLScissorW, GLScissorH;
static bool s_PluginInitialized = false; static bool s_PluginInitialized = false;
static volatile u32 s_swapRequested = false; static u32 s_swapRequested = FALSE;
static Common::Event s_swapResponseEvent; static u32 s_efbAccessRequested = FALSE;
static volatile u32 s_efbAccessRequested = false;
static Common::Event s_efbResponseEvent;
void GetDllInfo (PLUGIN_INFO* _PluginInfo) void GetDllInfo (PLUGIN_INFO* _PluginInfo)
{ {
@ -385,11 +382,7 @@ void Video_Prepare(void)
TextureConverter::Init(); TextureConverter::Init();
s_swapRequested = FALSE; s_swapRequested = FALSE;
s_swapResponseEvent.Init();
s_swapResponseEvent.Set();
s_efbAccessRequested = FALSE; s_efbAccessRequested = FALSE;
s_efbResponseEvent.Init();
s_PluginInitialized = true; s_PluginInitialized = true;
INFO_LOG(VIDEO, "Video plugin initialized."); INFO_LOG(VIDEO, "Video plugin initialized.");
@ -400,10 +393,7 @@ void Shutdown(void)
s_PluginInitialized = false; s_PluginInitialized = false;
s_efbAccessRequested = FALSE; s_efbAccessRequested = FALSE;
s_efbResponseEvent.Shutdown();
s_swapRequested = FALSE; s_swapRequested = FALSE;
s_swapResponseEvent.Shutdown();
Fifo_Shutdown(); Fifo_Shutdown();
PostProcessing::Shutdown(); PostProcessing::Shutdown();
@ -472,8 +462,7 @@ void VideoFifo_CheckSwapRequest()
// TODO: Find better name for this because I don't know if it means what it says. // TODO: Find better name for this because I don't know if it means what it says.
g_VideoInitialize.pCopiedToXFB(); g_VideoInitialize.pCopiedToXFB();
s_swapRequested = FALSE; Common::AtomicStoreRelease(s_swapRequested, FALSE);
s_swapResponseEvent.Set();
} }
} }
@ -507,13 +496,14 @@ void Video_BeginField(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight)
{ {
if (s_PluginInitialized) if (s_PluginInitialized)
{ {
if (s_swapRequested) // Make sure previous swap request has made it to the screen
{
if (g_VideoInitialize.bUseDualCore) if (g_VideoInitialize.bUseDualCore)
s_swapResponseEvent.MsgWait(); {
while (Common::AtomicLoadAcquire(s_swapRequested))
Common::YieldCPU();
}
else else
VideoFifo_CheckSwapRequest(); VideoFifo_CheckSwapRequest();
}
s_beginFieldArgs.xfbAddr = xfbAddr; s_beginFieldArgs.xfbAddr = xfbAddr;
s_beginFieldArgs.field = field; s_beginFieldArgs.field = field;
@ -531,14 +521,14 @@ void Video_EndField()
} }
} }
static volatile struct static struct
{ {
EFBAccessType type; EFBAccessType type;
u32 x; u32 x;
u32 y; u32 y;
} s_accessEFBArgs; } s_accessEFBArgs;
static volatile u32 s_AccessEFBResult = 0; static u32 s_AccessEFBResult = 0;
void VideoFifo_CheckEFBAccess() void VideoFifo_CheckEFBAccess()
{ {
@ -546,8 +536,7 @@ void VideoFifo_CheckEFBAccess()
{ {
s_AccessEFBResult = Renderer::AccessEFB(s_accessEFBArgs.type, s_accessEFBArgs.x, s_accessEFBArgs.y); s_AccessEFBResult = Renderer::AccessEFB(s_accessEFBArgs.type, s_accessEFBArgs.x, s_accessEFBArgs.y);
s_efbAccessRequested = FALSE; Common::AtomicStoreRelease(s_efbAccessRequested, FALSE);
s_efbResponseEvent.Set();
} }
} }
@ -562,7 +551,10 @@ u32 Video_AccessEFB(EFBAccessType type, u32 x, u32 y)
Common::AtomicStoreRelease(s_efbAccessRequested, TRUE); Common::AtomicStoreRelease(s_efbAccessRequested, TRUE);
if (g_VideoInitialize.bUseDualCore) if (g_VideoInitialize.bUseDualCore)
s_efbResponseEvent.MsgWait(); {
while (Common::AtomicLoadAcquire(s_efbAccessRequested))
Common::YieldCPU();
}
else else
VideoFifo_CheckEFBAccess(); VideoFifo_CheckEFBAccess();