diff options
| author | memberTwo.mb2 <memberTwo.mb2@gmail.com> | 2008-10-02 18:43:56 +0000 |
|---|---|---|
| committer | memberTwo.mb2 <memberTwo.mb2@gmail.com> | 2008-10-02 18:43:56 +0000 |
| commit | d15d6d2b5efc4b358ec6c8b3e4d7459cf30abc39 (patch) | |
| tree | 017ff023c5d0343e5a1d7e9bdbe3e8447974b6ec /Source/Core/VideoCommon/Src | |
| parent | 29fdb6837af87416880851a52b80ca94756fdc2d (diff) | |
r729 fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@746 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon/Src')
| -rw-r--r-- | Source/Core/VideoCommon/Src/Fifo.cpp | 16 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/Fifo.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp index 2768bed065..dfa770ea8e 100644 --- a/Source/Core/VideoCommon/Src/Fifo.cpp +++ b/Source/Core/VideoCommon/Src/Fifo.cpp @@ -24,7 +24,7 @@ #include "Fifo.h"
#if defined(DATAREADER_INLINE)
-extern u32 g_pVideoData;
+extern u8* g_pVideoData;
#else
FifoReader fifo;
#endif
@@ -61,9 +61,9 @@ void Fifo_Stop() { fifoStateRun = false;
}
-u32 FAKE_GetFifoStartPtr()
+u8* FAKE_GetFifoStartPtr()
{
- return (int)videoBuffer;
+ return videoBuffer;
}
int FAKE_GetFifoSize()
@@ -74,9 +74,9 @@ int FAKE_GetFifoSize() }
return (size - readptr);
}
-int FAKE_GetFifoEndAddr()
+u8* FAKE_GetFifoEndPtr()
{
- return (int)(videoBuffer+size);
+ return &videoBuffer[size];
}
u8 FAKE_PeekFifo8(u32 _uOffset)
@@ -104,9 +104,9 @@ int FAKE_GetPosition() return readptr;
}
-int FAKE_GetRealPtr()
+u8* FAKE_GetFifoCurrentPtr()
{
- return (int)(videoBuffer+readptr);
+ return &videoBuffer[readptr];
}
u16 FAKE_ReadFifo16()
@@ -138,7 +138,7 @@ void Video_SendFifoData(u8* _uData) // TODO (mb2): Better and DataReader inline for DX9
#ifdef DATAREADER_INLINE
if (g_pVideoData) // for DX9 plugin "compatibility"
- readptr = g_pVideoData-(u32)videoBuffer;
+ readptr = (int)(g_pVideoData-videoBuffer);
#endif
if (FAKE_GetFifoSize() > readptr)
{
diff --git a/Source/Core/VideoCommon/Src/Fifo.h b/Source/Core/VideoCommon/Src/Fifo.h index e3d480b9ff..f673efafcd 100644 --- a/Source/Core/VideoCommon/Src/Fifo.h +++ b/Source/Core/VideoCommon/Src/Fifo.h @@ -24,7 +24,7 @@ #include "ChunkFile.h"
// TODO (mb2) clean this if ok
-#define DATAREADER_INLINE // uncomment to use the previous IDataReader way
+#define DATAREADER_INLINE // comment to use the previous IDataReader way
//#define DATAREADER_DEBUG // simple compare with the previous IDataReader way
#if defined(DATAREADER_DEBUG) && !defined(DATAREADER_INLINE)
|