From 0100d74aa39d3a8932028ffdc2c9b225050b3f5a Mon Sep 17 00:00:00 2001 From: Sonicadvance1 Date: Tue, 30 Sep 2008 01:49:06 +0000 Subject: [PATCH] Woops, wasn't supposed to be changed git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@734 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoOGL/Src/OpcodeDecoding.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/OpcodeDecoding.cpp b/Source/Plugins/Plugin_VideoOGL/Src/OpcodeDecoding.cpp index 08d21b2cb1..fcab65c818 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/OpcodeDecoding.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/OpcodeDecoding.cpp @@ -62,7 +62,6 @@ extern u32 FAKE_GetFifoStartPtr(); extern int FAKE_GetRealPtr(); extern void FAKE_SkipFifo(u32 skip); - template void Xchg(T& a, T&b) { @@ -83,8 +82,8 @@ void ExecuteDisplayList(u32 address, u32 size) #ifdef DATAREADER_INLINE u32 old_pVideoData = g_pVideoData; - const u8* startAddress = Memory_GetPtr(address); - g_pVideoData = *startAddress; + const u32 startAddress = (u32)Memory_GetPtr(address); + g_pVideoData = startAddress; #endif // temporarily swap dl and non-dl(small "hack" for the stats) Xchg(stats.thisFrame.numDLPrims, stats.thisFrame.numPrims); @@ -93,7 +92,7 @@ void ExecuteDisplayList(u32 address, u32 size) Xchg(stats.thisFrame.numBPLoadsInDL, stats.thisFrame.numBPLoads); #ifdef DATAREADER_INLINE - while((g_pVideoData - *startAddress) < size) + while((g_pVideoData - startAddress) < size) #else while((memoryReader.GetReadAddress() - address) < size) #endif