converted to 64bit (please check on windows)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@741 8ced0084-cf51-0410-be5f-012b33b47a6e

1 files changed, 11 insertions, 10 deletions

diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp
index af2405ff28..22fe16bac1 100644
--- a/Source/Core/VideoCommon/Src/Fifo.cpp
+++ b/Source/Core/VideoCommon/Src/Fifo.cpp
@@ -31,8 +31,8 @@ FifoReader fifo;
 

 // STATE_TO_SAVE

 static u8 *videoBuffer;

-static int size = 0;

-static int readptr = 0;

+static u32 size = 0;

+static u64 readptr = 0;

 

 void Fifo_DoState(PointerWrap &p) {

     p.DoArray(videoBuffer, FIFO_SIZE);

@@ -53,12 +53,12 @@ void Fifo_Shutdown()
     FreeMemoryPages(videoBuffer, FIFO_SIZE);

 }

 

-u32 FAKE_GetFifoStartPtr()

+u64 FAKE_GetFifoStartPtr()

 {

-    return (int)videoBuffer;

+    return (u64)videoBuffer;

 }

 

-int FAKE_GetFifoSize()

+u64 FAKE_GetFifoSize()

 {

     if (size < readptr)

     {

@@ -66,9 +66,10 @@ int FAKE_GetFifoSize()
     }

     return (size - readptr);

 }

-int FAKE_GetFifoEndAddr()

+

+u64 FAKE_GetFifoEndAddr()

 {

-    return (int)(videoBuffer+size);

+    return (u64)(videoBuffer+size);

 }

 

 u8 FAKE_PeekFifo8(u32 _uOffset)

@@ -96,9 +97,9 @@ int FAKE_GetPosition()
     return readptr;

 }

 

-int FAKE_GetRealPtr()

+u64 FAKE_GetRealPtr()

 {

-	return (int)(videoBuffer+readptr);

+	return (u64)(videoBuffer+readptr);

 }

 

 u16 FAKE_ReadFifo16()

@@ -130,7 +131,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 = g_pVideoData-(u64)videoBuffer;

 #endif

         if (FAKE_GetFifoSize() > readptr)

         {