Merge branch 'master' into wii-network

Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Core/CMakeLists.txt
	Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp

1 files changed, 28 insertions, 4 deletions

diff --git a/Source/Core/VideoCommon/Src/VideoState.cpp b/Source/Core/VideoCommon/Src/VideoState.cpp
index b1c1ed0889..ad5384cda9 100644
--- a/Source/Core/VideoCommon/Src/VideoState.cpp
+++ b/Source/Core/VideoCommon/Src/VideoState.cpp
@@ -24,36 +24,60 @@
 #include "Fifo.h"
 #include "CommandProcessor.h"
 #include "PixelEngine.h"
+#include "PixelShaderManager.h"
+#include "VertexShaderManager.h"
+#include "VertexManagerBase.h"
 
 static void DoState(PointerWrap &p)
 {
     // BP Memory
     p.Do(bpmem);
-    // CP Memory
+	p.DoMarker("BP Memory");
+
+	// CP Memory
     p.DoArray(arraybases, 16);
     p.DoArray(arraystrides, 16);
     p.Do(MatrixIndexA);
     p.Do(MatrixIndexB);
     p.Do(g_VtxDesc.Hex);
 	p.DoArray(g_VtxAttr, 8);
+	p.DoMarker("CP Memory");
 
     // XF Memory
     p.Do(xfregs);
     p.DoArray(xfmem, XFMEM_SIZE);
-    // Texture decoder
+	p.DoMarker("XF Memory");
+
+	// Texture decoder
     p.DoArray(texMem, TMEM_SIZE);
+	p.DoMarker("texMem");
  
     // FIFO
     Fifo_DoState(p);
+	p.DoMarker("Fifo");
 
     CommandProcessor::DoState(p);
-    PixelEngine::DoState(p);
+	p.DoMarker("CommandProcessor");
+
+	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");
+
+	VertexShaderManager::DoState(p);
+	p.DoMarker("VertexShaderManager");
+
+	VertexManager::DoState(p);
+	p.DoMarker("VertexManager");
+
+	// TODO: search for more data that should be saved and add it here
 }
 
 void VideoCommon_DoState(PointerWrap &p)
 {
     DoState(p);
-	//TODO: search for more data that should be saved and add it here
 }
 
 void VideoCommon_RunLoop(bool enable)