From 0933ee2fd55ce031658124a56159a59ac051e736 Mon Sep 17 00:00:00 2001 From: ramapcsx2 Date: Tue, 28 Feb 2012 20:57:07 +0000 Subject: [PATCH] A couple minor changes, including a bad looking block manager bug that wasn't really all that bad :p git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5109 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/GS.cpp | 3 ++- pcsx2/HwRead.cpp | 2 +- pcsx2/x86/BaseblockEx.h | 3 --- plugins/GSdx/GSState.cpp | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pcsx2/GS.cpp b/pcsx2/GS.cpp index b00e8b65f3..65543b5136 100644 --- a/pcsx2/GS.cpp +++ b/pcsx2/GS.cpp @@ -79,7 +79,7 @@ static __fi void gsCSRwrite( const tGS_CSR& csr ) SIGNAL_IMR_Pending = false; #else GUNIT_WARN("GUNIT_WARN: csr.RESET"); - Console.Warning( "csr.RESET" ); + //Console.Warning( "csr.RESET" ); //gifUnit.Reset(true); // Don't think gif should be reset... gifUnit.gsSIGNAL.queued = false; GetMTGS().SendSimplePacket(GS_RINGTYPE_RESET, 0, 0, 0); @@ -425,6 +425,7 @@ __fi void gsFrameSkip() //We got away with it before i think due to our awful GS timing, but now we have it right (ish) void gsPostVsyncStart() { + //gifUnit.FlushToMTGS(); // Needed for some (broken?) homebrew game loaders CSRreg.SwapField(); GetMTGS().PostVsyncStart(); } diff --git a/pcsx2/HwRead.cpp b/pcsx2/HwRead.cpp index c9483d3e6f..f6b34a02d5 100644 --- a/pcsx2/HwRead.cpp +++ b/pcsx2/HwRead.cpp @@ -203,7 +203,7 @@ mem16_t __fastcall hwRead16_page_0F_INTC_HACK(u32 mem) u32 ret32 = _hwRead32<0x0f, true>(mem & ~0x03); u16 ret16 = ((u16*)&ret32)[(mem>>1) & 0x01]; - eeHwTraceLog( mem, ret16, "Read" ); + eeHwTraceLog( mem, ret16, true ); return ret16; } diff --git a/pcsx2/x86/BaseblockEx.h b/pcsx2/x86/BaseblockEx.h index 2fc4cd80c1..89ccec31ec 100644 --- a/pcsx2/x86/BaseblockEx.h +++ b/pcsx2/x86/BaseblockEx.h @@ -127,9 +127,6 @@ public: void clear() { - if(blocks) { - memset(blocks, 0, sizeof(blocks)); - } _Size = 0; } diff --git a/plugins/GSdx/GSState.cpp b/plugins/GSdx/GSState.cpp index da5ae92911..bc281a98f8 100644 --- a/plugins/GSdx/GSState.cpp +++ b/plugins/GSdx/GSState.cpp @@ -184,7 +184,7 @@ void GSState::SetFrameSkip(int skip) void GSState::Reset() { - printf("GS reset\n"); + printf("GSdx info: GS reset\n"); // FIXME: memset(m_mem.m_vm8, 0, m_mem.m_vmsize); // bios logo not shown cut in half after reset, missing graphics in GoW after first FMV memset(&m_path[0], 0, sizeof(m_path[0]) * countof(m_path));