diff --git a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp index 687be2ced3..2d277857ff 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp @@ -31,11 +31,6 @@ void FifoRecordAnalyzer::Initialize(u32* cpMem) memcpy(s_CpMem.arrayStrides, cpMem + 0xB0, 16 * 4); } -void FifoRecordAnalyzer::AnalyzeGPCommand(u8* data) -{ - FifoAnalyzer::AnalyzeCommand(data, DECODE_RECORD); -} - void FifoRecordAnalyzer::ProcessLoadIndexedXf(u32 val, int array) { int index = val >> 16; diff --git a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h index 53a591543f..7bf9052a4f 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h +++ b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h @@ -12,13 +12,9 @@ namespace FifoRecordAnalyzer { - // Must call this before analyzing GP commands + // Must call this before analyzing Fifo commands with FifoAnalyzer::AnalyzeCommand() void Initialize(u32* cpMem); - // Assumes data contains all information for the command - // Calls FifoRecorder::UseMemory - void AnalyzeGPCommand(u8* data); - void ProcessLoadIndexedXf(u32 val, int array); void WriteVertexArray(int arrayIndex, u8* vertexData, int vertexSize, int numVertices); }; diff --git a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp index a6a4007432..7a1d6bd7f3 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp +++ b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp @@ -68,7 +68,9 @@ void FifoRecorder::WriteGPCommand(u8* data, u32 size) { if (!m_SkipNextData) { - FifoRecordAnalyzer::AnalyzeGPCommand(data); + // Assumes data contains all information for the command + // Calls FifoRecorder::UseMemory + FifoAnalyzer::AnalyzeCommand(data, FifoAnalyzer::DECODE_RECORD); // Copy data to buffer size_t currentSize = m_FifoData.size();