mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-22 15:40:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removing Core::IsGPUThread() and Core::IsCPUThread() calls in favor of simple bool isCPUThread parameter value.

Browse Source
This commit is contained in:
James Dunne 2013-03-14 01:08:26 -05:00
parent 4137fc0023
commit f1ef51abc8
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/VideoCommon/Src/CommandProcessor.cpp
View File

@ -468,7 +468,7 @@ void STACKALIGN GatherPipeBursted()
} }
if (IsOnThread()) if (IsOnThread())
SetCpStatus(); SetCpStatus(true);
// update the fifo-pointer // update the fifo-pointer
if (fifo.CPWritePointer >= fifo.CPEnd) if (fifo.CPWritePointer >= fifo.CPEnd)
@ -518,14 +518,14 @@ void AbortFrame()
} }
void SetCpStatus() void SetCpStatus(bool isCPUThread)
{ {
// overflow & underflow check // overflow & underflow check
fifo.bFF_HiWatermark = (fifo.CPReadWriteDistance > fifo.CPHiWatermark); fifo.bFF_HiWatermark = (fifo.CPReadWriteDistance > fifo.CPHiWatermark);
fifo.bFF_LoWatermark = (fifo.CPReadWriteDistance < fifo.CPLoWatermark); fifo.bFF_LoWatermark = (fifo.CPReadWriteDistance < fifo.CPLoWatermark);
// breakpoint // breakpoint
if (Core::IsGPUThread()) if (!isCPUThread)
{ {
if (fifo.bFF_BPEnable) if (fifo.bFF_BPEnable)
{ {
@ -567,15 +567,17 @@ void SetCpStatus()
u64 userdata = interrupt?1:0; u64 userdata = interrupt?1:0;
if (IsOnThread()) if (IsOnThread())
{ {
if(!interrupt || bpInt || undfInt || ovfInt) if (!interrupt || bpInt || undfInt || ovfInt)
{ {
if (Core::IsGPUThread()) if (!isCPUThread)
{ {
// GPU thread:
interruptWaiting = true; interruptWaiting = true;
CommandProcessor::UpdateInterruptsFromVideoBackend(userdata); CommandProcessor::UpdateInterruptsFromVideoBackend(userdata);
} }
else if (Core::IsCPUThread()) else
{ {
// CPU thread:
interruptSet = interrupt; interruptSet = interrupt;
INFO_LOG(COMMANDPROCESSOR,"Interrupt set"); INFO_LOG(COMMANDPROCESSOR,"Interrupt set");
ProcessorInterface::SetInterrupt(INT_CAUSE_CP, interrupt); ProcessorInterface::SetInterrupt(INT_CAUSE_CP, interrupt);

2
Source/Core/VideoCommon/Src/CommandProcessor.h
View File

@ -155,7 +155,7 @@ void Write16(const u16 _Data, const u32 _Address);
void Read32(u32& _rReturnValue, const u32 _Address); void Read32(u32& _rReturnValue, const u32 _Address);
void Write32(const u32 _Data, const u32 _Address); void Write32(const u32 _Data, const u32 _Address);
void SetCpStatus(); void SetCpStatus(bool isCPUThread = false);
void GatherPipeBursted(); void GatherPipeBursted();
void UpdateInterrupts(u64 userdata); void UpdateInterrupts(u64 userdata);
void UpdateInterruptsFromVideoBackend(u64 userdata); void UpdateInterruptsFromVideoBackend(u64 userdata);

4
Source/Core/VideoCommon/Src/memcpy_amd.cpp
View File

@ -465,8 +465,8 @@ End:
void * memcpy_amd(void *dest, const void *src, size_t n) void * memcpy_amd(void *dest, const void *src, size_t n)
{ {
memcpy(dest, src, n); memcpy(dest, src, n);
return dest; return dest;
} }