Reformat all the things. Have fun with merge conflicts.

This commit is contained in:
Pierre Bourdon
2016-06-24 10:43:46 +02:00
parent 2115e8a4a6
commit 3570c7f03a
1116 changed files with 187405 additions and 180344 deletions

View File

@ -5,10 +5,10 @@
#include <cstring>
#include "Common/ChunkFile.h"
#include "VideoCommon/BoundingBox.h"
#include "VideoCommon/BPMemory.h"
#include "VideoCommon/CommandProcessor.h"
#include "VideoCommon/BoundingBox.h"
#include "VideoCommon/CPMemory.h"
#include "VideoCommon/CommandProcessor.h"
#include "VideoCommon/Fifo.h"
#include "VideoCommon/GeometryShaderManager.h"
#include "VideoCommon/PixelEngine.h"
@ -19,56 +19,56 @@
#include "VideoCommon/VideoState.h"
#include "VideoCommon/XFMemory.h"
void VideoCommon_DoState(PointerWrap &p)
void VideoCommon_DoState(PointerWrap& p)
{
// BP Memory
p.Do(bpmem);
p.DoMarker("BP Memory");
// BP Memory
p.Do(bpmem);
p.DoMarker("BP Memory");
// CP Memory
DoCPState(p);
// CP Memory
DoCPState(p);
// XF Memory
p.Do(xfmem);
p.DoMarker("XF Memory");
// XF Memory
p.Do(xfmem);
p.DoMarker("XF Memory");
// Texture decoder
p.DoArray(texMem);
p.DoMarker("texMem");
// Texture decoder
p.DoArray(texMem);
p.DoMarker("texMem");
// FIFO
Fifo::DoState(p);
p.DoMarker("Fifo");
// FIFO
Fifo::DoState(p);
p.DoMarker("Fifo");
CommandProcessor::DoState(p);
p.DoMarker("CommandProcessor");
CommandProcessor::DoState(p);
p.DoMarker("CommandProcessor");
PixelEngine::DoState(p);
p.DoMarker("PixelEngine");
PixelEngine::DoState(p);
p.DoMarker("PixelEngine");
// the old way of replaying current bpmem as writes to push side effects to pixel shader manager doesn't really work.
PixelShaderManager::DoState(p);
p.DoMarker("PixelShaderManager");
// the old way of replaying current bpmem as writes to push side effects to pixel shader manager
// doesn't really work.
PixelShaderManager::DoState(p);
p.DoMarker("PixelShaderManager");
VertexShaderManager::DoState(p);
p.DoMarker("VertexShaderManager");
VertexShaderManager::DoState(p);
p.DoMarker("VertexShaderManager");
GeometryShaderManager::DoState(p);
p.DoMarker("GeometryShaderManager");
GeometryShaderManager::DoState(p);
p.DoMarker("GeometryShaderManager");
VertexManagerBase::DoState(p);
p.DoMarker("VertexManager");
VertexManagerBase::DoState(p);
p.DoMarker("VertexManager");
BoundingBox::DoState(p);
p.DoMarker("BoundingBox");
BoundingBox::DoState(p);
p.DoMarker("BoundingBox");
// TODO: search for more data that should be saved and add it here
// TODO: search for more data that should be saved and add it here
}
void VideoCommon_Init()
{
memset(&g_main_cp_state, 0, sizeof(g_main_cp_state));
memset(&g_preprocess_cp_state, 0, sizeof(g_preprocess_cp_state));
memset(texMem, 0, TMEM_SIZE);
memset(&g_main_cp_state, 0, sizeof(g_main_cp_state));
memset(&g_preprocess_cp_state, 0, sizeof(g_preprocess_cp_state));
memset(texMem, 0, TMEM_SIZE);
}