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

Used Atomic functions to update variables shared between the CPU and GPU threads. 

Changed the variables from bool to u32 to match the atomic functions.
This commit is contained in:
skidau 2013-02-09 17:46:48 +11:00
parent 2c8c8db731
commit 5f672baca3
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Source/Core/VideoCommon/Src/PixelEngine.cpp
View File

@ -32,6 +32,7 @@
#include "HW/ProcessorInterface.h" #include "HW/ProcessorInterface.h"
#include "DLCache.h" #include "DLCache.h"
#include "State.h" #include "State.h"
#include "Thread.h"
namespace PixelEngine namespace PixelEngine
{ {
@ -110,14 +111,14 @@ static UPEAlphaReadReg m_AlphaRead;
static UPECtrlReg m_Control; static UPECtrlReg m_Control;
//static u16 m_Token; // token value most recently encountered //static u16 m_Token; // token value most recently encountered
volatile bool g_bSignalTokenInterrupt; volatile u32 g_bSignalTokenInterrupt;
volatile bool g_bSignalFinishInterrupt; volatile u32 g_bSignalFinishInterrupt;
static int et_SetTokenOnMainThread; static int et_SetTokenOnMainThread;
static int et_SetFinishOnMainThread; static int et_SetFinishOnMainThread;
volatile bool interruptSetToken = false; volatile u32 interruptSetToken = 0;
volatile bool interruptSetFinish = false; volatile u32 interruptSetFinish = 0;
u16 bbox[4]; u16 bbox[4];
bool bbox_active; bool bbox_active;
@ -161,10 +162,10 @@ void Init()
m_AlphaModeConf.Hex = 0; m_AlphaModeConf.Hex = 0;
m_AlphaRead.Hex = 0; m_AlphaRead.Hex = 0;
g_bSignalTokenInterrupt = false; g_bSignalTokenInterrupt = 0;
g_bSignalFinishInterrupt = false; g_bSignalFinishInterrupt = 0;
interruptSetToken = false; interruptSetToken = 0;
interruptSetFinish = false; interruptSetFinish = 0;
et_SetTokenOnMainThread = CoreTiming::RegisterEvent("SetToken", SetToken_OnMainThread); et_SetTokenOnMainThread = CoreTiming::RegisterEvent("SetToken", SetToken_OnMainThread);
et_SetFinishOnMainThread = CoreTiming::RegisterEvent("SetFinish", SetFinish_OnMainThread); et_SetFinishOnMainThread = CoreTiming::RegisterEvent("SetFinish", SetFinish_OnMainThread);
@ -211,7 +212,7 @@ void Read16(u16& _uReturnValue, const u32 _iAddress)
break; break;
case PE_TOKEN_REG: case PE_TOKEN_REG:
_uReturnValue = CommandProcessor::fifo.PEToken; _uReturnValue = Common::AtomicLoad(*(volatile u32*)&CommandProcessor::fifo.PEToken);
INFO_LOG(PIXELENGINE, "(r16) TOKEN_REG : %04x", _uReturnValue); INFO_LOG(PIXELENGINE, "(r16) TOKEN_REG : %04x", _uReturnValue);
break; break;
@ -312,8 +313,8 @@ void Write16(const u16 _iValue, const u32 _iAddress)
{ {
UPECtrlReg tmpCtrl(_iValue); UPECtrlReg tmpCtrl(_iValue);
if (tmpCtrl.PEToken) g_bSignalTokenInterrupt = false; if (tmpCtrl.PEToken) g_bSignalTokenInterrupt = 0;
if (tmpCtrl.PEFinish) g_bSignalFinishInterrupt = false; if (tmpCtrl.PEFinish) g_bSignalFinishInterrupt = 0;
m_Control.PETokenEnable = tmpCtrl.PETokenEnable; m_Control.PETokenEnable = tmpCtrl.PETokenEnable;
m_Control.PEFinishEnable = tmpCtrl.PEFinishEnable; m_Control.PEFinishEnable = tmpCtrl.PEFinishEnable;
@ -360,13 +361,13 @@ void UpdateInterrupts()
void UpdateTokenInterrupt(bool active) void UpdateTokenInterrupt(bool active)
{ {
ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, active); ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, active);
interruptSetToken = active; Common::AtomicStore(interruptSetToken, active ? 1 : 0);
} }
void UpdateFinishInterrupt(bool active) void UpdateFinishInterrupt(bool active)
{ {
ProcessorInterface::SetInterrupt(INT_CAUSE_PE_FINISH, active); ProcessorInterface::SetInterrupt(INT_CAUSE_PE_FINISH, active);
interruptSetFinish = active; Common::AtomicStore(interruptSetFinish, active ? 1 : 0);
} }
// TODO(mb2): Refactor SetTokenINT_OnMainThread(u64 userdata, int cyclesLate). // TODO(mb2): Refactor SetTokenINT_OnMainThread(u64 userdata, int cyclesLate).
@ -443,7 +444,7 @@ void ResetSetToken()
if (g_bSignalTokenInterrupt) if (g_bSignalTokenInterrupt)
{ {
UpdateTokenInterrupt(false); UpdateTokenInterrupt(false);
g_bSignalTokenInterrupt = false; g_bSignalTokenInterrupt = 0;
} }
else else
{ {
@ -454,6 +455,6 @@ void ResetSetToken()
bool WaitingForPEInterrupt() bool WaitingForPEInterrupt()
{ {
return !CommandProcessor::waitingForPEInterruptDisable && (CommandProcessor::interruptFinishWaiting || CommandProcessor::interruptTokenWaiting || interruptSetFinish || interruptSetToken); return !CommandProcessor::waitingForPEInterruptDisable && (CommandProcessor::interruptFinishWaiting || CommandProcessor::interruptTokenWaiting || Common::AtomicLoad(interruptSetFinish) || Common::AtomicLoad(interruptSetToken));
} }
} // end of namespace PixelEngine } // end of namespace PixelEngine