From 08fe3c213ad71e903fed83edfada5a79c75f11f9 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Tue, 26 Feb 2013 18:28:56 -0500
Subject: [PATCH] Abort loading states from incompatible graphics backends.

---
 Source/Core/Core/Src/State.cpp                     | 2 +-
 Source/Core/VideoCommon/Src/MainBase.cpp           | 5 +++++
 Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp
index 0facf2f387..773d757337 100644
--- a/Source/Core/Core/Src/State.cpp
+++ b/Source/Core/Core/Src/State.cpp
@@ -71,7 +71,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
 static std::thread g_save_thread;
 
 // Don't forget to increase this after doing changes on the savestate system
-static const u32 STATE_VERSION = 14;
+static const u32 STATE_VERSION = 15;
 
 struct StateHeader
 {
diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp
index 726ef71b38..a881bebfb2 100644
--- a/Source/Core/VideoCommon/Src/MainBase.cpp
+++ b/Source/Core/VideoCommon/Src/MainBase.cpp
@@ -186,6 +186,11 @@ void VideoBackendHardware::InitializeShared()
 // Run from the CPU thread
 void VideoBackendHardware::DoState(PointerWrap& p)
 {
+	bool software = false;
+	p.Do(software);
+	if (p.GetMode() == PointerWrap::MODE_READ && software == true)
+		// change mode to abort load of incompatible save state.
+		p.SetMode(PointerWrap::MODE_VERIFY);
 	VideoCommon_DoState(p);
 	p.DoMarker("VideoCommon");
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
index d78b8ba13b..6976b18690 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
@@ -41,6 +41,7 @@
 #include "Core.h"
 #include "OpcodeDecoder.h"
 #include "SWVertexLoader.h"
+#include "SWStatistics.h"
 
 #define VSYNC_ENABLED 0
 
@@ -97,6 +98,11 @@ bool VideoSoftware::Initialize(void *&window_handle)
 
 void VideoSoftware::DoState(PointerWrap& p)
 {
+	bool software = true;
+	p.Do(software);
+	if (p.GetMode() == PointerWrap::MODE_READ && software == false)
+		// change mode to abort load of incompatible save state.
+		p.SetMode(PointerWrap::MODE_VERIFY);
 	// TODO: incomplete
 	SWCommandProcessor::DoState(p);
 	SWPixelEngine::DoState(p);
@@ -105,6 +111,7 @@ void VideoSoftware::DoState(PointerWrap& p)
 	Clipper::DoState(p);
 	p.Do(swxfregs);
     p.Do(bpmem);
+	p.Do(swstats);
 
 	// CP Memory
     p.DoArray(arraybases, 16);