Reformat all the things. Have fun with merge conflicts.

1 files changed, 37 insertions, 37 deletions

diff --git a/Source/Core/VideoCommon/VideoState.cpp b/Source/Core/VideoCommon/VideoState.cpp
index 90c18a0368..6caccd5fd9 100644
--- a/Source/Core/VideoCommon/VideoState.cpp
+++ b/Source/Core/VideoCommon/VideoState.cpp
@@ -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");
-
-	// CP Memory
-	DoCPState(p);
+  // BP Memory
+  p.Do(bpmem);
+  p.DoMarker("BP Memory");
 
-	// XF Memory
-	p.Do(xfmem);
-	p.DoMarker("XF Memory");
+  // CP Memory
+  DoCPState(p);
 
-	// Texture decoder
-	p.DoArray(texMem);
-	p.DoMarker("texMem");
+  // XF Memory
+  p.Do(xfmem);
+  p.DoMarker("XF Memory");
 
-	// FIFO
-	Fifo::DoState(p);
-	p.DoMarker("Fifo");
+  // Texture decoder
+  p.DoArray(texMem);
+  p.DoMarker("texMem");
 
-	CommandProcessor::DoState(p);
-	p.DoMarker("CommandProcessor");
+  // FIFO
+  Fifo::DoState(p);
+  p.DoMarker("Fifo");
 
-	PixelEngine::DoState(p);
-	p.DoMarker("PixelEngine");
+  CommandProcessor::DoState(p);
+  p.DoMarker("CommandProcessor");
 
-	// 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");
+  PixelEngine::DoState(p);
+  p.DoMarker("PixelEngine");
 
-	VertexShaderManager::DoState(p);
-	p.DoMarker("VertexShaderManager");
+  // 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");
 
-	GeometryShaderManager::DoState(p);
-	p.DoMarker("GeometryShaderManager");
+  VertexShaderManager::DoState(p);
+  p.DoMarker("VertexShaderManager");
 
-	VertexManagerBase::DoState(p);
-	p.DoMarker("VertexManager");
+  GeometryShaderManager::DoState(p);
+  p.DoMarker("GeometryShaderManager");
 
-	BoundingBox::DoState(p);
-	p.DoMarker("BoundingBox");
+  VertexManagerBase::DoState(p);
+  p.DoMarker("VertexManager");
 
+  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);
 }