The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-11 00:29:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

reverting 64 bit as it doesn't work properly.

Browse Source 
Well can't say I didn't try :-)


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@743 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-10-02 14:25:03 +00:00
parent 8439b06fdc
commit 55226f7ec4
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/VideoCommon/Src/Fifo.cpp
View File

@ -31,8 +31,8 @@ FifoReader fifo;
// STATE_TO_SAVE
static u8 *videoBuffer;
static u32 size = 0;
static u64 readptr = 0;
static int size = 0;
static int readptr = 0;
void Fifo_DoState(PointerWrap &p) {
p.DoArray(videoBuffer, FIFO_SIZE);
@ -53,12 +53,12 @@ void Fifo_Shutdown()
FreeMemoryPages(videoBuffer, FIFO_SIZE);
}
u64 FAKE_GetFifoStartPtr()
u32 FAKE_GetFifoStartPtr()
{
return (u64)videoBuffer;
return (int)videoBuffer;
}
u64 FAKE_GetFifoSize()
int FAKE_GetFifoSize()
{
if (size < readptr)
{
@ -66,10 +66,9 @@ u64 FAKE_GetFifoSize()
}
return (size - readptr);
}
u64 FAKE_GetFifoEndAddr()
int FAKE_GetFifoEndAddr()
{
return (u64)(videoBuffer+size);
return (int)(videoBuffer+size);
}
u8 FAKE_PeekFifo8(u32 _uOffset)
@ -97,9 +96,9 @@ int FAKE_GetPosition()
return readptr;
}
u64 FAKE_GetRealPtr()
int FAKE_GetRealPtr()
{
return (u64)(videoBuffer+readptr);
return (int)(videoBuffer+readptr);
}
u16 FAKE_ReadFifo16()
@ -131,7 +130,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-(u64)videoBuffer;
readptr = g_pVideoData-(u32)videoBuffer;
#endif
if (FAKE_GetFifoSize() > readptr)
{

2
Source/Plugins/Plugin_VideoOGL/Src/OpcodeDecoding.cpp
View File

@ -82,7 +82,7 @@ void ExecuteDisplayList(u32 address, u32 size)
#ifdef DATAREADER_INLINE
u32 old_pVideoData = g_pVideoData;
const u64 startAddress = (u64)Memory_GetPtr(address);
const u32 startAddress = (u32)Memory_GetPtr(address);
g_pVideoData = startAddress;
#endif
// temporarily swap dl and non-dl(small "hack" for the stats)