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

Merge pull request #180 from lioncash/const 

Apply const to some functions in Gif_Unit.h
This commit is contained in:
Pseudonym 2014-07-31 13:47:10 +01:00
parent 93374facb8 10fd86fd68
commit 1fb057462a
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pcsx2/Gif_Unit.h
View File

@ -188,11 +188,10 @@ struct Gif_Path {
gsPack.Reset();
}
bool isMTVU() { return !idx && THREAD_VU1; }
s32 getReadAmount() { return AtomicRead(readAmount) + gsPack.readAmount; }
bool hasDataRemaining() { return curOffset < curSize; }
bool isDone() { return isMTVU() ? !mtvu.fakePackets
: (!hasDataRemaining() && (state == GIF_PATH_IDLE || state == GIF_PATH_WAIT)); }
bool isMTVU() const { return !idx && THREAD_VU1; }
s32 getReadAmount() { return AtomicRead(readAmount) + gsPack.readAmount; }
bool hasDataRemaining() const { return curOffset < curSize; }
bool isDone() const { return isMTVU() ? !mtvu.fakePackets : (!hasDataRemaining() && (state == GIF_PATH_IDLE || state == GIF_PATH_WAIT)); }
// Waits on the MTGS to process gs packets
void mtgsReadWait() {
@ -613,25 +612,26 @@ struct Gif_Unit {
}
// XGkick
bool CanDoPath1() { return (stat.APATH == 0 || stat.APATH == 1
|| (stat.APATH == 3 && CanDoP3Slice()))
&& (CanDoGif() == 1); }
bool CanDoPath1() const {
return (stat.APATH == 0 || stat.APATH == 1 || (stat.APATH == 3 && CanDoP3Slice())) && CanDoGif();
}
// Direct
bool CanDoPath2() { return (stat.APATH == 0 || stat.APATH == 2
|| (stat.APATH == 3 && CanDoP3Slice()))
&& (CanDoGif() == 1); }
bool CanDoPath2() const {
return (stat.APATH == 0 || stat.APATH == 2 || (stat.APATH == 3 && CanDoP3Slice())) && CanDoGif();
}
// DirectHL
bool CanDoPath2HL() { return (stat.APATH == 0 || stat.APATH == 2)
&& (CanDoGif() == 1); }
bool CanDoPath2HL() const {
return (stat.APATH == 0 || stat.APATH == 2) && CanDoGif();
}
// Gif DMA - CHECK_GIFREVERSEHACK is a hack for Hot Wheels.
bool CanDoPath3() { return((stat.APATH == 0 && !Path3Masked())
|| stat.APATH == 3)
&& (CanDoGif() == 1); }
bool CanDoPath3() const {
return((stat.APATH == 0 && !Path3Masked()) || stat.APATH == 3) && CanDoGif();
}
bool CanDoP3Slice() { return stat.IMT == 1 && gifPath[GIF_PATH_3].state == GIF_PATH_IMAGE; }
bool CanDoGif() { return stat.PSE == 0 && (CHECK_GIFREVERSEHACK ? 1 : stat.DIR == 0) && gsSIGNAL.queued == 0; }
bool CanDoP3Slice()const { return stat.IMT == 1 && gifPath[GIF_PATH_3].state == GIF_PATH_IMAGE; }
bool CanDoGif() const { return stat.PSE == 0 && (CHECK_GIFREVERSEHACK ? 1 : stat.DIR == 0) && gsSIGNAL.queued == 0; }
//Mask stops the next packet which hasnt started from transferring
bool Path3Masked() { return ((stat.M3R || stat.M3P) && (gifPath[GIF_PATH_3].state == GIF_PATH_IDLE || gifPath[GIF_PATH_3].state == GIF_PATH_WAIT)); }
bool Path3Masked() const { return ((stat.M3R || stat.M3P) && (gifPath[GIF_PATH_3].state == GIF_PATH_IDLE || gifPath[GIF_PATH_3].state == GIF_PATH_WAIT)); }
void PrintInfo(bool printP1=1, bool printP2=1, bool printP3=1) {
u32 a = checkPaths(1,1,1), b = checkQueued(1,1,1);