Fix debug mode build, fix some profile stuff to not get compiled when profiling is off, cleaned a bit.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@941 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2008-10-22 22:35:29 +00:00
parent 4b2c7310b7
commit 4d169987c2
9 changed files with 30 additions and 40 deletions

View File

@ -24,7 +24,6 @@
// 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.
#include "D3DBase.h"
#include "Common.h"
@ -35,39 +34,25 @@
#include "OpcodeDecoding.h"
#include "TextureCache.h"
#include "ShaderManager.h"
#include "DecodedVArray.h"
#include "BPStructs.h"
#include "XFStructs.h"
#include "Utils.h"
#include "main.h"
#include "Fifo.h"
#include "DataReader.h"
#include "DLCompiler.h"
#define CMDBUFFER_SIZE 1024*1024
DecodedVArray tempvarray;
u8 *g_pVideoData = 0;
extern u8* FAKE_GetFifoStartPtr();
extern u8* FAKE_GetFifoEndPtr();
void Decode();
static void Decode();
template <class T>
void Xchg(T& a, T&b)
{
T c = a;
a = b;
b = c;
}
void ExecuteDisplayList(u32 address, u32 size)
static void ExecuteDisplayList(u32 address, u32 size)
{
u8* old_pVideoData = g_pVideoData;
u8* startAddress = Memory_GetPtr(address);
g_pVideoData = startAddress;
@ -88,7 +73,7 @@ void ExecuteDisplayList(u32 address, u32 size)
g_pVideoData = old_pVideoData;
}
bool FifoCommandRunnable(void)
bool FifoCommandRunnable()
{
u32 iBufferSize = (u32)(FAKE_GetFifoEndPtr()-g_pVideoData);
if (iBufferSize == 0)
@ -224,15 +209,15 @@ bool FifoCommandRunnable(void)
return true;
}
void Decode(void)
static void Decode(void)
{
int Cmd = DataReadU8();
switch(Cmd)
switch (Cmd)
{
case GX_NOP:
break;
case GX_LOAD_CP_REG: //0x08
case GX_LOAD_CP_REG:
{
u32 SubCmd = DataReadU8();
u32 Value = DataReadU32();