piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 17:19:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

DataReader inline for OGL/DX9 and moved to VideoCommon. Large clean up.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@760 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
memberTwo.mb2
2008-10-03 22:05:28 +00:00
parent 8997f9cb3e
commit 8d0f6d40f4
20 changed files with 284 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
View File

@ -728,14 +728,6 @@
RelativePath=".\Src\BPStructs.h"
>
</File>
<File
RelativePath=".\Src\DataReader.cpp"
>
</File>
<File
RelativePath=".\Src\DataReader.h"
>
</File>
<File
RelativePath=".\Src\OpcodeDecoding.cpp"
>

122
Source/Plugins/Plugin_VideoOGL/Src/DataReader.cpp
View File

@ -1,122 +0,0 @@
// Copyright (C) 2003-2008 Dolphin Project.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 2.0.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License 2.0 for more details.
// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include "Globals.h"
#include "DataReader.h"
#if !defined(DATAREADER_INLINE) || defined(DATAREADER_DEBUG)
// =================================================================================================
// CDataReader_Fifo
// =================================================================================================
IDataReader* g_pDataReader = NULL;
extern u8 FAKE_ReadFifo8();
extern u16 FAKE_ReadFifo16();
extern u32 FAKE_ReadFifo32();
extern int FAKE_GetPosition();
extern u8* FAKE_GetFifoCurrentPtr();
extern void FAKE_SkipFifo(u32 skip);
IDataReader::~IDataReader()
{
}
CDataReader_Fifo::CDataReader_Fifo(void)
{
}
u8 CDataReader_Fifo::Read8(void)
{
return FAKE_ReadFifo8();
};
u16 CDataReader_Fifo::Read16(void)
{
return FAKE_ReadFifo16();
};
u32 CDataReader_Fifo::Read32(void)
{
return FAKE_ReadFifo32();
};
void CDataReader_Fifo::Skip(u32 skip)
{
return FAKE_SkipFifo(skip);
}
int CDataReader_Fifo::GetPosition()
{
return FAKE_GetPosition();
}
u8* CDataReader_Fifo::GetRealCurrentPtr()
{
return FAKE_GetFifoCurrentPtr();
}
// =================================================================================================
// CDataReader_Memory
// =================================================================================================
CDataReader_Memory::CDataReader_Memory(u32 _uAddress) :
m_uReadAddress(_uAddress)
{
//m_pMemory = g_VideoInitialize.pGetMemoryPointer(0x00);
}
u32 CDataReader_Memory::GetReadAddress()
{
return m_uReadAddress;
}
int CDataReader_Memory::GetPosition()
{
return m_uReadAddress;
}
u8 CDataReader_Memory::Read8()
{
u8 tmp = Memory_Read_U8(m_uReadAddress);//m_pMemory[m_uReadAddress];
m_uReadAddress++;
return tmp;
}
u16 CDataReader_Memory::Read16()
{
u16 tmp = Memory_Read_U16(m_uReadAddress);//_byteswap_ushort(*(u16*)&m_pMemory[m_uReadAddress]);
m_uReadAddress += 2;
return tmp;
}
u32 CDataReader_Memory::Read32()
{
u32 tmp = Memory_Read_U32(m_uReadAddress);//_byteswap_ulong(*(u32*)&m_pMemory[m_uReadAddress]);
m_uReadAddress += 4;
return tmp;
}
void CDataReader_Memory::Skip(u32 skip)
{
m_uReadAddress += skip;
}
u8* CDataReader_Memory::GetRealCurrentPtr()
{
return Memory_GetPtr(m_uReadAddress);
}
#endif

218
Source/Plugins/Plugin_VideoOGL/Src/DataReader.h
View File

@ -1,218 +0,0 @@
// Copyright (C) 2003-2008 Dolphin Project.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 2.0.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License 2.0 for more details.
// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#ifndef _DATAREADER_H
#define _DATAREADER_H
#include "Fifo.h"
#if !defined(DATAREADER_INLINE) || defined(DATAREADER_DEBUG)
// =================================================================================================
// IDataReader
// =================================================================================================
class IDataReader
{
protected:
virtual ~IDataReader();
public:
virtual void Skip(u32) = 0;
virtual u8 Read8 () = 0;
virtual u16 Read16() = 0;
virtual u32 Read32() = 0;
virtual int GetPosition() = 0; // return values can be anything, as long as relative distances are correct
virtual u8* GetRealCurrentPtr() = 0;
};
// =================================================================================================
// CDataReader_Fifo
// =================================================================================================
class CDataReader_Fifo : public IDataReader
{
private:
public:
CDataReader_Fifo();
virtual void Skip(u32);
virtual u8 Read8();
virtual u16 Read16();
virtual u32 Read32();
virtual int GetPosition();
virtual u8* GetRealCurrentPtr();
};
// =================================================================================================
// CDataReader_Memory
// =================================================================================================
class CDataReader_Memory : public IDataReader
{
private:
//u8* m_pMemory;
u32 m_uReadAddress;
public:
CDataReader_Memory(u32 _uAddress);
u32 GetReadAddress();
virtual void Skip(u32);
virtual u8 Read8();
virtual u16 Read16();
virtual u32 Read32();
virtual int GetPosition();
virtual u8* GetRealCurrentPtr();
};
extern IDataReader* g_pDataReader;
#endif
#ifdef DATAREADER_INLINE
extern u8* g_pVideoData;
#endif
#ifdef DATAREADER_DEBUG
extern u8* g_pDataReaderRealPtr;
#define DATAREADER_DEBUG_CHECK_PTR g_pDataReaderRealPtr = g_pDataReader->GetRealCurrentPtr(); \
if (g_pDataReaderRealPtr!=g_pVideoData) _asm int 3
#define DATAREADER_DEBUG_CHECK_PTR_VAL g_pDataReaderRealPtr = g_pDataReader->GetRealCurrentPtr(); \
if ((g_pDataReaderRealPtr != g_pVideoData) || (tmp != tmpdb)) _asm int 3
//#define DATAREADER_DEBUG_CHECK_PTR_VAL DATAREADER_DEBUG_CHECK_PTR
#else
#define DATAREADER_DEBUG_CHECK_PTR
#define DATAREADER_DEBUG_CHECK_PTR_VAL
#endif
#ifdef DATAREADER_INLINE
inline u8 DataPeek8(u32 _uOffset)
{
u8 tmp = *(u8*)(g_pVideoData + _uOffset);
return tmp;
}
inline u16 DataPeek16(u32 _uOffset)
{
u16 tmp = Common::swap16(*(u16*)(g_pVideoData + _uOffset));
return tmp;
}
inline u32 DataPeek32(u32 _uOffset) {
u32 tmp = Common::swap32(*(u32*)(g_pVideoData + _uOffset));
return tmp;
}
inline u8 DataReadU8()
{
u8 tmp = *g_pVideoData;
g_pVideoData++;
#ifdef DATAREADER_DEBUG
u8 tmpdb = g_pDataReader->Read8();
DATAREADER_DEBUG_CHECK_PTR_VAL;
#endif
return tmp;
}
inline u16 DataReadU16()
{
u16 tmp = Common::swap16(*(u16*)g_pVideoData);
g_pVideoData+=2;
#ifdef DATAREADER_DEBUG
u16 tmpdb = g_pDataReader->Read16();
DATAREADER_DEBUG_CHECK_PTR_VAL;
#endif
return tmp;
}
inline u32 DataReadU32()
{
u32 tmp = Common::swap32(*(u32*)g_pVideoData);
g_pVideoData+=4;
#ifdef DATAREADER_DEBUG
u32 tmpdb = g_pDataReader->Read32();
DATAREADER_DEBUG_CHECK_PTR_VAL;
#endif
return tmp;
}
inline float DataReadF32()
{
union {u32 i; float f;} temp;
temp.i = Common::swap32(*(u32*)g_pVideoData);
g_pVideoData+=4;
float tmp = temp.f;
#ifdef DATAREADER_DEBUG
//TODO clean up
u32 tmp3 = g_pDataReader->Read32();
float tmpdb = *(float*)(&tmp3);
DATAREADER_DEBUG_CHECK_PTR_VAL;
#endif
return tmp;
}
inline u8* DataGetPosition()
{
#ifdef DATAREADER_DEBUG
DATAREADER_DEBUG_CHECK_PTR;
#endif
return g_pVideoData;
}
inline void DataSkip(u32 skip)
{
g_pVideoData += skip;
#ifdef DATAREADER_DEBUG
g_pDataReader->Skip(skip);
DATAREADER_DEBUG_CHECK_PTR;
#endif
}
#else
inline u8 DataReadU8()
{
u8 tmp = g_pDataReader->Read8();
return tmp;
}
inline u16 DataReadU16()
{
u16 tmp = g_pDataReader->Read16();
return tmp;
}
inline u32 DataReadU32()
{
u32 tmp = g_pDataReader->Read32();
return tmp;
}
inline float DataReadF32()
{
u32 tmp2 = g_pDataReader->Read32();
float tmp = *(float*)(&tmp2);
return tmp;
}
inline void DataSkip(u32 skip)
{
g_pDataReader->Skip(skip);
}
#endif
#endif

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

@ -16,11 +16,11 @@
// http://code.google.com/p/dolphin-emu/
//DL facts:
// Ikaruga uses NO display lists!
// Ikaruga uses (nearly) NO display lists!
// Zelda WW uses TONS of display lists
// Zelda TP uses almost 100% display lists except menus (we like this!)
// Note that it IS NOT POSSIBLE to precompile display lists! You can compile them as they are
// Note that it IS NOT GENERALLY POSSIBLE to precompile display lists! You can compile them as they are
// and hope that the vertex format doesn't change, though, if you do it just when they are
// called. The reason is that the vertex format affects the sizes of the vertices.
@ -37,31 +37,13 @@
#define CMDBUFFER_SIZE 1024*1024
#if ! defined(DATAREADER_INLINE) || defined(DATAREADER_DEBUG)
CDataReader_Fifo g_fifoReader;
#endif
#ifdef DATAREADER_DEBUG
u8* g_pDataReaderRealPtr=0;
#endif
u8* g_pVideoData = 0;
#ifdef DATAREADER_INLINE
u8* g_pVideoData=0;
extern bool g_IsFifoRewinded;
#endif
extern u8* FAKE_GetFifoStartPtr();
extern u8* FAKE_GetFifoEndPtr();
void Decode();
#if !defined(DATAREADER_INLINE) || defined(DATAREADER_DEBUG)
extern u8 FAKE_PeekFifo8(u32 _uOffset);
extern u16 FAKE_PeekFifo16(u32 _uOffset);
extern u32 FAKE_PeekFifo32(u32 _uOffset);
extern int FAKE_GetFifoSize();
#endif
extern u8* FAKE_GetFifoEndPtr();
extern u8* FAKE_GetFifoStartPtr();
extern u8* FAKE_GetFifoCurrentPtr();
extern void FAKE_SkipFifo(u32 skip);
template <class T>
void Xchg(T& a, T&b)
{
@ -72,30 +54,18 @@ void Xchg(T& a, T&b)
void ExecuteDisplayList(u32 address, u32 size)
{
#if ! defined(DATAREADER_INLINE) || defined(DATAREADER_DEBUG)
IDataReader* pOldReader = g_pDataReader;
//address &= 0x01FFFFFF; // phys address
CDataReader_Memory memoryReader(address);
g_pDataReader = &memoryReader;
#endif
#ifdef DATAREADER_INLINE
u8* old_pVideoData = g_pVideoData;
u8* startAddress = 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);
Xchg(stats.thisFrame.numXFLoadsInDL, stats.thisFrame.numXFLoads);
Xchg(stats.thisFrame.numCPLoadsInDL, stats.thisFrame.numCPLoads);
Xchg(stats.thisFrame.numBPLoadsInDL, stats.thisFrame.numBPLoads);
#ifdef DATAREADER_INLINE
while((g_pVideoData - startAddress) < size)
#else
while((memoryReader.GetReadAddress() - address) < size)
#endif
while((u32)(g_pVideoData - startAddress) < size)
{
Decode();
}
@ -108,38 +78,17 @@ void ExecuteDisplayList(u32 address, u32 size)
Xchg(stats.thisFrame.numCPLoadsInDL, stats.thisFrame.numCPLoads);
Xchg(stats.thisFrame.numBPLoadsInDL, stats.thisFrame.numBPLoads);
// reset to the old reader
#ifdef DATAREADER_INLINE
// reset to the old pointer
g_pVideoData = old_pVideoData;
#endif
#if defined(DATAREADER_DEBUG) || !defined(DATAREADER_INLINE)
g_pDataReader = pOldReader;
#endif
}
bool FifoCommandRunnable(void)
{
#ifndef DATAREADER_INLINE
u32 iBufferSize = FAKE_GetFifoSize();
#else
u32 iBufferSize = (u32)(FAKE_GetFifoEndPtr()-g_pVideoData);
#ifdef DATAREADER_DEBUG
u32 iBufferSizedb = FAKE_GetFifoSize();
if( iBufferSize != iBufferSizedb) _asm int 3
#endif
#endif
if (iBufferSize == 0)
return false;
return false; // can't peek
#if !defined(DATAREADER_INLINE)
u8 Cmd = FAKE_PeekFifo8(0);
#else
u8 Cmd = DataPeek8(0);
#ifdef DATAREADER_DEBUG
if( Cmd != FAKE_PeekFifo8(0)) _asm int 3
#endif
#endif
u32 iCommandSize = 0;
switch(Cmd)
@ -183,14 +132,7 @@ bool FifoCommandRunnable(void)
if (iBufferSize >= 5)
{
iCommandSize = 1 + 4;
#if !defined(DATAREADER_INLINE) || defined(DATAREADER_DEBUG)
u32 Cmd2 = FAKE_PeekFifo32(1);
#ifdef DATAREADER_DEBUG
if( Cmd2 != DataPeek32(1)) _asm int 3
#endif
#else
u32 Cmd2 = DataPeek32(1);
#endif
int dwTransferSize = ((Cmd2 >> 16) & 15) + 1;
iCommandSize += dwTransferSize * 4;
}
@ -208,22 +150,17 @@ bool FifoCommandRunnable(void)
if (iBufferSize >= 3)
{
iCommandSize = 1 + 2;
#if !defined(DATAREADER_INLINE) || defined(DATAREADER_DEBUG)
u16 numVertices = FAKE_PeekFifo16(1);
#ifdef DATAREADER_DEBUG
if( numVertices != DataPeek16(1)) _asm int 3
#endif
#else
u16 numVertices = DataPeek16(1);
#endif
VertexLoader& vtxLoader = g_VertexLoaders[Cmd & GX_VAT_MASK];
iCommandSize += numVertices * vtxLoader.ComputeVertexSize();
}
else {
else
{
return false;
}
}
else {
else
{
char szTemp[1024];
sprintf(szTemp, "GFX: Unknown Opcode (0x%x).\n"
"This means one of the following:\n"
@ -231,9 +168,38 @@ bool FifoCommandRunnable(void)
"* Command stream corrupted by some spurious memory bug\n"
"* This really is an unknown opcode (unlikely)\n"
"* Some other sort of bug\n\n"
"Dolphin will now likely crash or hang. Enjoy.", Cmd);
"Dolphin will now likely crash or hang. Enjoy." , Cmd);
g_VideoInitialize.pSysMessage(szTemp);
g_VideoInitialize.pLog(szTemp, TRUE);
{
SCPFifoStruct &fifo = *g_VideoInitialize.pCPFifo;
char szTmp[256];
// sprintf(szTmp, "Illegal command %02x (at %08x)",Cmd,g_pDataReader->GetPtr());
sprintf(szTmp, "Illegal command %02x\n"
"CPBase: 0x%08x\n"
"CPEnd: 0x%08x\n"
"CPHiWatermark: 0x%08x\n"
"CPLoWatermark: 0x%08x\n"
"CPReadWriteDistance: 0x%08x\n"
"CPWritePointer: 0x%08x\n"
"CPReadPointer: 0x%08x\n"
"CPBreakpoint: 0x%08x\n"
"bFF_GPReadEnable: %s\n"
"bFF_BPEnable: %s\n"
"bFF_GPLinkEnable: %s\n"
"bFF_Breakpoint: %s\n"
"bPauseRead: %s\n"
,Cmd, fifo.CPBase, fifo.CPEnd, fifo.CPHiWatermark, fifo.CPLoWatermark, fifo.CPReadWriteDistance
,fifo.CPWritePointer, fifo.CPReadPointer, fifo.CPBreakpoint, fifo.bFF_GPReadEnable ? "true" : "false"
,fifo.bFF_BPEnable ? "true" : "false" ,fifo.bFF_GPLinkEnable ? "true" : "false"
,fifo.bFF_Breakpoint ? "true" : "false", fifo.bPauseRead ? "true" : "false");
g_VideoInitialize.pLog(szTmp, TRUE);
g_VideoInitialize.pLog(szTemp, TRUE);
// _assert_msg_(0,szTmp,"");
}
}
break;
}
@ -339,16 +305,7 @@ void Decode(void)
void OpcodeDecoder_Init()
{
#if !defined(DATAREADER_INLINE)
g_pDataReader = &g_fifoReader;
#else
g_pVideoData = FAKE_GetFifoStartPtr();
#if defined(DATAREADER_DEBUG)
g_pDataReader = &g_fifoReader;
g_pDataReaderRealPtr = g_pDataReader->GetRealCurrentPtr();
DATAREADER_DEBUG_CHECK_PTR;
#endif
#endif
}
@ -361,7 +318,6 @@ void OpcodeDecoder_Run()
DVSTARTPROFILE();
while (FifoCommandRunnable())
{
DATAREADER_DEBUG_CHECK_PTR;
Decode();
}
}