summaryrefslogtreecommitdiff
path: root/Source/Plugins
diff options
context:
space:
mode:
authorhrydgard <hrydgard@gmail.com>2008-08-23 09:20:36 +0000
committerhrydgard <hrydgard@gmail.com>2008-08-23 09:20:36 +0000
commitf82bf2ae9abbf2cfeef5ad88a1a8d55ff0171afa (patch)
treea0fac34e4e58a9f5125370aae43fe3d1ce124a24 /Source/Plugins
parent0becaa3223e57557b9d53bf1564d8da9eff0a64c (diff)
Lots of FP hacking for little gain, super monkey ball is only slightly more sane (wow, it rhymed). Temporary no-speed-limit hack: Hold TAB.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@279 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins')
-rw-r--r--Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp7
-rw-r--r--Source/Plugins/Plugin_VideoDX9/Src/OpcodeDecoding.cpp11
-rw-r--r--Source/Plugins/Plugin_VideoOGL/Src/OpcodeDecoding.cpp17
3 files changed, 15 insertions, 20 deletions
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp
index 7aca16604e..cee0c2048e 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp
@@ -74,7 +74,7 @@ void Mixer(short *buffer, int numSamples, int bits, int rate, int channels)
}
void Mixer_PushSamples(short *buffer, int num_stereo_samples, int sample_rate) {
-// static FILE *f;
+// static FILE *f;
// if (!f)
// f = fopen("d:\\hello.raw", "wb");
// fwrite(buffer, num_stereo_samples * 4, 1, f);
@@ -83,6 +83,7 @@ void Mixer_PushSamples(short *buffer, int num_stereo_samples, int sample_rate) {
static int PV1r=0,PV2r=0,PV3r=0,PV4r=0;
static int acc=0;
+ if (!GetAsyncKeyState(VK_TAB)) {
while (queue_size > queue_maxlength / 2) {
#ifdef _WIN32
DSound::DSound_UpdateSound();
@@ -91,7 +92,9 @@ void Mixer_PushSamples(short *buffer, int num_stereo_samples, int sample_rate) {
sleep(0);
#endif
}
-
+ } else {
+ return;
+ }
//convert into config option?
const int mode = 2;
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/OpcodeDecoding.cpp b/Source/Plugins/Plugin_VideoDX9/Src/OpcodeDecoding.cpp
index 8f5b9b07e9..914acd7f29 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/OpcodeDecoding.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/OpcodeDecoding.cpp
@@ -210,16 +210,6 @@ bool FifoCommandRunnable(void)
void Decode(void)
{
- static int DecoderCount = 0;
- DecoderCount++;
-
- if (DecoderCount == 0x0019c601)
- {
- int i = 0;
- }
-
- // 0x0019c603 <- error
-
int Cmd = g_pDataReader->Read8();
switch(Cmd)
{
@@ -236,7 +226,6 @@ void Decode(void)
case GX_LOAD_XF_REG:
{
- u32 test = PeekFifo32(0);
u32 Cmd2 = g_pDataReader->Read32();
int dwTransferSize = ((Cmd2>>16)&15) + 1;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/OpcodeDecoding.cpp b/Source/Plugins/Plugin_VideoOGL/Src/OpcodeDecoding.cpp
index 29d69fc0ed..9ef9f03b53 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/OpcodeDecoding.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/OpcodeDecoding.cpp
@@ -145,23 +145,26 @@ bool FifoCommandRunnable(void)
case GX_LOAD_XF_REG:
{
// check if we can read the header
- if (iBufferSize >= 5) {
+ if (iBufferSize >= 5)
+ {
iCommandSize = 1 + 4;
u32 Cmd2 = PeekFifo32(1);
- int dwTransferSize = ((Cmd2>>16)&15) + 1;
+ int dwTransferSize = ((Cmd2 >> 16) & 15) + 1;
iCommandSize += dwTransferSize * 4;
}
- else {
+ else
+ {
return false;
}
}
break;
default:
- if (Cmd&0x80)
+ if (Cmd & 0x80)
{
// check if we can read the header
- if (iBufferSize >= 3) {
+ if (iBufferSize >= 3)
+ {
iCommandSize = 1 + 2;
u16 numVertices = PeekFifo16(1);
VertexLoader& vtxLoader = g_VertexLoaders[Cmd & GX_VAT_MASK];
@@ -189,7 +192,7 @@ bool FifoCommandRunnable(void)
if (iCommandSize > iBufferSize)
return false;
- INFO_LOG("OP detected: Cmd 0x%x size %i buffer %i",Cmd, iCommandSize, iBufferSize);
+ // INFO_LOG("OP detected: Cmd 0x%x size %i buffer %i",Cmd, iCommandSize, iBufferSize);
return true;
}
@@ -268,7 +271,7 @@ void Decode(void)
{
// load vertices
u16 numVertices = g_pDataReader->Read16();
- if( numVertices > 0 ) {
+ if (numVertices > 0) {
g_VertexLoaders[Cmd & GX_VAT_MASK].RunVertices((Cmd & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT, numVertices);
}
}